diff --git a/xyz-psql-connector/src/main/java/com/here/xyz/psql/query/SearchForFeatures.java b/xyz-psql-connector/src/main/java/com/here/xyz/psql/query/SearchForFeatures.java
index be988984a6..da792b6cac 100644
--- a/xyz-psql-connector/src/main/java/com/here/xyz/psql/query/SearchForFeatures.java
+++ b/xyz-psql-connector/src/main/java/com/here/xyz/psql/query/SearchForFeatures.java
@@ -115,10 +115,7 @@ private static boolean canSearchFor(SearchForFeaturesEvent event, DataSourceProv
         boolean isPropertyQuery = key.startsWith("properties.");
 
         /** If property query hits default system index - allow search. [id, properties.@ns:com:here:xyz.createdAt, properties.@ns:com:here:xyz.updatedAt]" */
-        if (     key.equals("id")
-            ||  key.equals("properties.@ns:com:here:xyz.createdAt")
-            ||  key.equals("properties.@ns:com:here:xyz.updatedAt")
-        )
+        if ( key.equals("id") )
           return true;
 
         /** Check if custom Indices are available. Eg.: properties.foo1&f.foo2*/