diff --git a/helm/templates/grafana/dashboard-config-map.yaml b/helm/templates/grafana/dashboard-config-map.yaml
index cc9ec623f3ef71459ccad65128bf8cd65f0d6eb6..459021213c1d4c746819ddabac790800b9a6ed09 100644
--- a/helm/templates/grafana/dashboard-config-map.yaml
+++ b/helm/templates/grafana/dashboard-config-map.yaml
@@ -527,7 +527,7 @@ data:
         "steppedLine": false,
         "targets": [
           {
-            "expr": "sum by(topic) (kafka_topic_partitions >= 0)",
+            "expr": "kafka_topic_partitions",
             "format": "time_series",
             "intervalFactor": 1,
             "legendFormat": "{{topic}}",
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
index ab4617ecd1a46e083c863d26c999a25ee5008836..d7781a9334384e900acbaaa00471995c00ccb630 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
@@ -34,7 +34,7 @@ final class DocumentMapper extends SimpleFunction<ActivePowerRecord, Document> {
   private String createDocumentName(final String documentId) {
     this.initFirestoreConfig();
     return "projects/" + this.firestoreConfig.getProjectId()
-        + "/databases/" + this.firestoreConfig.getDatabaseDdlRequest()
+        + "/databases/" + this.firestoreConfig.getDatabase()
         + "/documents/" + this.collection
         + "/" + documentId;
   }
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
index eb62d69f907cc27f3974f09942e5d75ba701a34f..1482a59811f6fc6c0126d412f65e3e871b10220a 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
@@ -16,8 +16,8 @@ final class FirestoreConfig {
     return this.firestoreOptions.getProjectId();
   }
 
-  public String getDatabaseDdlRequest() {
-    return this.firestoreOptions.getProjectId();
+  public String getDatabase() {
+    return this.firestoreOptions.getDatabaseId();
   }
 
   public static FirestoreConfig createFromDefaults() throws IOException {