diff --git a/citydb-database/src/main/java/org/citydb/database/schema/Index.java b/citydb-database/src/main/java/org/citydb/database/schema/Index.java
index 0151799a..195583df 100644
--- a/citydb-database/src/main/java/org/citydb/database/schema/Index.java
+++ b/citydb-database/src/main/java/org/citydb/database/schema/Index.java
@@ -36,6 +36,7 @@ public class Index {
     public static final Index GEOMETRY_DATA_GEOMETRY = Index.spatial("geometry_data_spx", Table.GEOMETRY_DATA, "geometry");
     public static final Index IMPLICIT_GEOMETRY_OBJECTID = Index.normal("implicit_geometry_objectid_inx", Table.IMPLICIT_GEOMETRY, "objectid");
     public static final Index PROPERTY_NAME = Index.normal("property_name_inx", Table.PROPERTY, "name");
+    public static final Index PROPERTY_NAMESPACE = Index.normal("property_namespace_inx", Table.PROPERTY, "namespace");
     public static final Index PROPERTY_VAL_TIMESTAMP = Index.normal("property_val_date_inx", Table.PROPERTY, "val_timestamp");
     public static final Index PROPERTY_VAL_DOUBLE = Index.normal("property_val_double_inx", Table.PROPERTY, "val_double");
     public static final Index PROPERTY_VAL_INT = Index.normal("property_val_int_inx", Table.PROPERTY, "val_int");
diff --git a/citydb-database/src/main/java/org/citydb/database/util/IndexHelper.java b/citydb-database/src/main/java/org/citydb/database/util/IndexHelper.java
index c475c7d1..5e9447b9 100644
--- a/citydb-database/src/main/java/org/citydb/database/util/IndexHelper.java
+++ b/citydb-database/src/main/java/org/citydb/database/util/IndexHelper.java
@@ -33,7 +33,6 @@
 
 public class IndexHelper {
     public static final Set<Index> DEFAULT_INDEXES = new LinkedHashSet<>(List.of(
-            Index.FEATURE_OBJECTID,
             Index.FEATURE_IDENTIFIER,
             Index.FEATURE_ENVELOPE,
             Index.FEATURE_CREATION_DATE,
@@ -41,6 +40,7 @@ public class IndexHelper {
             Index.FEATURE_VALID_TO,
             Index.GEOMETRY_DATA_GEOMETRY,
             Index.PROPERTY_NAME,
+            Index.PROPERTY_NAMESPACE,
             Index.PROPERTY_VAL_TIMESTAMP,
             Index.PROPERTY_VAL_DOUBLE,
             Index.PROPERTY_VAL_INT,