diff --git a/src/Table/Search.php b/src/Table/Search.php
index 3bae1d0303..8c7a1879b5 100644
--- a/src/Table/Search.php
+++ b/src/Table/Search.php
@@ -81,14 +81,12 @@ final class Search
             return ' WHERE ' . $_POST['customWhereClause'];
         }
 
-        // If there are no search criteria set or no unary criteria operators,
-        // return
         if (
-            ! isset($_POST['criteriaColumnOperators'])
-            || (
-                ! isset($_POST['criteriaValues'])
-                && ! isset($_POST['criteriaColumnOperators'])
-                && ! isset($_POST['geom_func'])
+            ! isset(
+                $_POST['criteriaColumnOperators'],
+                $_POST['criteriaValues'],
+                $_POST['criteriaColumnNames'],
+                $_POST['criteriaColumnTypes'],
             )
         ) {
             return '';