diff --git a/geoapi/database/PisSqlManager.php b/geoapi/database/PisSqlManager.php
index 0744bc1..4baa90e 100644
--- a/geoapi/database/PisSqlManager.php
+++ b/geoapi/database/PisSqlManager.php
@@ -38,6 +38,12 @@ class PisSqlManager extends SQLManager {
      */
     private static $selectTerm = "SELECT pid, iName, iValue FROM pis WHERE ";
 
+    /**
+     * String for the select all part of the query
+     * @var string
+     */
+    private static $selectAllTerm = "SELECT pid, iName, iValue FROM pis ";
+
     /**
      * String for the orderby part of the query
      * @var string
@@ -83,19 +89,24 @@ class PisSqlManager extends SQLManager {
             $query .= self::$openBracket;
             $query .= \utiliy\ArrayManager::toSqlWhereString($pidList, self::$orTerm, self::$pidTerm);
             $query .= self::$closeBracket;
-        } else {
+        } else if ($pidList[0] != "*") {
             return null;
         }
 
         if (count($iNameList) > 0 && \utiliy\ArrayManager::validAlphaNumList($iNameList)) {
-            $query .= self::$andTerm;
+            if ($query != self::$selectTerm) {
+                $query .= self::$andTerm;
+            }
             $query .= self::$openBracket;
             $query .= \utiliy\ArrayManager::toSqlWhereString($iNameList, self::$orTerm, self::$iNameTerm);
             $query .= self::$closeBracket;
         }
+
+        if ($query == self::$selectTerm) {
+            $query = self::$selectAllTerm;
+        }
         
         $query .= self::$orderByTerm;
-        
         // send query
         return $this->query($query);
     }
diff --git a/geoapi/database/PssSqlManager.php b/geoapi/database/PssSqlManager.php
index 5360547..4f0d85f 100644
--- a/geoapi/database/PssSqlManager.php
+++ b/geoapi/database/PssSqlManager.php
@@ -44,6 +44,12 @@ class PssSqlManager extends SQLManager {
      */
     private static $selectTerm = "SELECT pid, sName, sap, request FROM pss WHERE ";
 
+    /**
+     * String for the select all part of the query
+     * @var string
+     */
+    private static $selectAllTerm = "SELECT pid, sName, sap, request FROM pss ";
+
     /**
      * String for the orderby part of the query
      * @var string
@@ -89,7 +95,7 @@ class PssSqlManager extends SQLManager {
             $query .= self::$openBracket;
             $query .= \utiliy\ArrayManager::toSqlWhereString($pidList, self::$orTerm, self::$pidTerm);
             $query .= self::$closeBracket;
-        } else {
+        }  else if ($pidList[0] != "*") {
             return null;
         }
 
@@ -100,6 +106,10 @@ class PssSqlManager extends SQLManager {
             $query .= self::$closeBracket;
         }
 
+        if ($query == self::$selectTerm) {
+            $query = self::$selectAllTerm;
+        }
+        
         $query .= self::$orderByTerm;
 
         // send query