diff --git a/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java b/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java
index a66e8c1ed5..fd221dd579 100644
--- a/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java
+++ b/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java
@@ -1,7 +1,8 @@
 package io.aiven.klaw.helpers.db.rdbms;
 
 import static io.aiven.klaw.helpers.KwConstants.*;
-import static org.reflections.Reflections.log;
+import static io.aiven.klaw.helpers.KwConstants.DATE_TIME_DDMMMYYYY_HHMMSS_FORMATTER;
+import static io.aiven.klaw.helpers.KwConstants.REQUESTOR_SUBSCRIPTIONS;
 
 import com.google.common.collect.Lists;
 import io.aiven.klaw.dao.*;
@@ -1284,14 +1285,15 @@ public List<CommonUtilsService.ChartsOverviewItem<Integer, Integer>> selectAclsC
 
       Map<String, Env> name2envsFromDb =
           StreamSupport.stream(selectEnvsDetails(envIds.keySet(), tenantId).spliterator(), false)
-              .collect(Collectors.toMap(Env::getName, Function.identity()));
+              .collect(Collectors.toMap(Env::getId, Function.identity()));
 
       for (var envIdEntry : envIds.entrySet()) {
         if (!name2envsFromDb.containsKey(envIdEntry.getKey())) {
           log.error("Error: Environment not found for env {}", envIdEntry.getKey());
         } else {
           totalTopicCount.add(
-              CommonUtilsService.ChartsOverviewItem.of(envIdEntry.getKey(), envIdEntry.getValue()));
+              CommonUtilsService.ChartsOverviewItem.of(
+                  name2envsFromDb.get(envIdEntry.getKey()).getName(), envIdEntry.getValue()));
         }
       }
     } catch (Exception e) {
diff --git a/core/src/main/java/io/aiven/klaw/service/CommonUtilsService.java b/core/src/main/java/io/aiven/klaw/service/CommonUtilsService.java
index 65afc656d2..a215c71348 100644
--- a/core/src/main/java/io/aiven/klaw/service/CommonUtilsService.java
+++ b/core/src/main/java/io/aiven/klaw/service/CommonUtilsService.java
@@ -230,8 +230,10 @@ public <X> ChartsJsOverview getChartsJsOverview(
     List<String> labels = new ArrayList<>(size);
     List<String> colors = new ArrayList<>(size);
 
-    data.add(0);
-    labels.add("");
+    if (activityCountList.isEmpty()) {
+      data.add(0);
+      labels.add("");
+    }
 
     int totalCount = 0;