diff --git a/gradle.properties b/gradle.properties
index 974eee12b..1eb4cfeb6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ mavenPassword=YourPassword
 #   here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/LibPsql.kt (adminVersion property)
 #     Warning: Only update LibPsql version, if there is a change in SQL functions!
 #              The reason is, that this version is encoded in the database, and when updated, forced an upgrade!
-version=3.0.0-beta.37
+version=3.0.0-beta.38
 
 org.gradle.jvmargs=-Xmx12g
 kotlin.code.style=official
diff --git a/here-naksha-app-service/src/jvmMain/resources/swagger/openapi.yaml b/here-naksha-app-service/src/jvmMain/resources/swagger/openapi.yaml
index 4d53de0d3..56b03acf0 100644
--- a/here-naksha-app-service/src/jvmMain/resources/swagger/openapi.yaml
+++ b/here-naksha-app-service/src/jvmMain/resources/swagger/openapi.yaml
@@ -12,7 +12,7 @@ servers:
 info:
   title: "Naskha Hub-API"
   description: "Naksha Hub-API is a REST API to provide simple access to geo data."
-  version: "3.0.0-beta.37"
+  version: "3.0.0-beta.38"
 
 security:
   - AccessToken: [ ]
diff --git a/here-naksha-lib-model/src/commonMain/kotlin/naksha/model/NakshaVersion.kt b/here-naksha-lib-model/src/commonMain/kotlin/naksha/model/NakshaVersion.kt
index bd8092697..6df869efe 100644
--- a/here-naksha-lib-model/src/commonMain/kotlin/naksha/model/NakshaVersion.kt
+++ b/here-naksha-lib-model/src/commonMain/kotlin/naksha/model/NakshaVersion.kt
@@ -89,7 +89,7 @@ class NakshaVersion(
          * The current version as string to constant usage cases.
          * @since 3.0
          */
-        const val CURRENT = "3.0.0-beta.37"
+        const val CURRENT = "3.0.0-beta.38"
         // WARNING: Do not update this property manually, it is automatically modified when building!
         //          Edit version only in `gradle.properties` file, which is used as well to create artifacts!
 
diff --git a/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgQueryWhereBuilder.kt b/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgQueryWhereBuilder.kt
index e20112b05..7c845870a 100644
--- a/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgQueryWhereBuilder.kt
+++ b/here-naksha-lib-psql/src/commonMain/kotlin/naksha/psql/PgQueryWhereBuilder.kt
@@ -322,6 +322,7 @@ internal class PgQueryWhereBuilder(private val request: ReadFeatures) {
             } else {
                 where.append(" (")
             }
+            where.append("($tagsAsJsonb IS NOT NULL) AND ")
             whereNestedTags(tagQuery)
             where.append(")")
         }