diff --git a/dashboards/grafana/cache-details-dashboard.json b/dashboards/grafana/cache-details-dashboard.json
index 19c5b80bf..fc2a5a2c3 100644
--- a/dashboards/grafana/cache-details-dashboard.json
+++ b/dashboards/grafana/cache-details-dashboard.json
@@ -1311,7 +1311,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1619,7 +1619,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1895,7 +1895,7 @@
               },
               {
                 "id": "unit",
-                "value": "none"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -2484,7 +2484,7 @@
               },
               {
                 "id": "unit",
-                "value": "none"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/cache-store-details-dashboard.json b/dashboards/grafana/cache-store-details-dashboard.json
index 97f81a96f..434ae1528 100644
--- a/dashboards/grafana/cache-store-details-dashboard.json
+++ b/dashboards/grafana/cache-store-details-dashboard.json
@@ -776,7 +776,7 @@
               },
               {
                 "id": "unit",
-                "value": "none"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/coherence-dashboard-main.json b/dashboards/grafana/coherence-dashboard-main.json
index 403373ccb..4e20d420c 100644
--- a/dashboards/grafana/coherence-dashboard-main.json
+++ b/dashboards/grafana/coherence-dashboard-main.json
@@ -1450,7 +1450,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1651,7 +1651,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1849,11 +1849,11 @@
             "properties": [
               {
                 "id": "displayName",
-                "value": "Member Name"
+                "value": "Member"
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -2028,7 +2028,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -2201,7 +2201,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -2863,7 +2863,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -3057,7 +3057,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -3275,7 +3275,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/executor-details.json b/dashboards/grafana/executor-details.json
index 5720e151e..e650bcac2 100644
--- a/dashboards/grafana/executor-details.json
+++ b/dashboards/grafana/executor-details.json
@@ -159,11 +159,11 @@
             "properties": [
               {
                 "id": "displayName",
-                "value": "Member Name"
+                "value": "Member"
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/federation-details-dashboard.json b/dashboards/grafana/federation-details-dashboard.json
index 4244e278e..2739d9d2e 100644
--- a/dashboards/grafana/federation-details-dashboard.json
+++ b/dashboards/grafana/federation-details-dashboard.json
@@ -2372,7 +2372,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/grpc-proxy-details-dashboard.json b/dashboards/grafana/grpc-proxy-details-dashboard.json
index 228ca532b..0e46190b6 100644
--- a/dashboards/grafana/grpc-proxy-details-dashboard.json
+++ b/dashboards/grafana/grpc-proxy-details-dashboard.json
@@ -357,7 +357,7 @@
               },
               {
                 "id": "unit",
-                "value": "none"
+                "value": "string"
               },
               {
                 "id": "links",
diff --git a/dashboards/grafana/grpc-proxy-summary-dashboard.json b/dashboards/grafana/grpc-proxy-summary-dashboard.json
index 059bdc3d8..7e06a5312 100644
--- a/dashboards/grafana/grpc-proxy-summary-dashboard.json
+++ b/dashboards/grafana/grpc-proxy-summary-dashboard.json
@@ -348,7 +348,7 @@
               },
               {
                 "id": "unit",
-                "value": "none"
+                "value": "string"
               },
               {
                 "id": "links",
diff --git a/dashboards/grafana/members-summary-dashboard.json b/dashboards/grafana/members-summary-dashboard.json
index 95b87433e..8bc970469 100644
--- a/dashboards/grafana/members-summary-dashboard.json
+++ b/dashboards/grafana/members-summary-dashboard.json
@@ -179,11 +179,11 @@
             "properties": [
               {
                 "id": "displayName",
-                "value": "Member Name"
+                "value": "Member"
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -532,11 +532,11 @@
             "properties": [
               {
                 "id": "displayName",
-                "value": "Member Name"
+                "value": "Member"
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -679,11 +679,11 @@
             "properties": [
               {
                 "id": "displayName",
-                "value": "Member Name"
+                "value": "Member"
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/persistence-summary-dashboard.json b/dashboards/grafana/persistence-summary-dashboard.json
index 9f5364c42..e96b41d34 100644
--- a/dashboards/grafana/persistence-summary-dashboard.json
+++ b/dashboards/grafana/persistence-summary-dashboard.json
@@ -412,7 +412,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/proxy-server-detail-dashboard.json b/dashboards/grafana/proxy-server-detail-dashboard.json
index b653ee946..bce34831b 100644
--- a/dashboards/grafana/proxy-server-detail-dashboard.json
+++ b/dashboards/grafana/proxy-server-detail-dashboard.json
@@ -242,7 +242,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -531,7 +531,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/service-details-dashboard.json b/dashboards/grafana/service-details-dashboard.json
index b22f900f7..947b44271 100644
--- a/dashboards/grafana/service-details-dashboard.json
+++ b/dashboards/grafana/service-details-dashboard.json
@@ -259,7 +259,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1950,7 +1950,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -2307,7 +2307,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/services-summary-dashboard.json b/dashboards/grafana/services-summary-dashboard.json
index ed881a780..9471a6f7c 100644
--- a/dashboards/grafana/services-summary-dashboard.json
+++ b/dashboards/grafana/services-summary-dashboard.json
@@ -1399,7 +1399,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1616,7 +1616,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/topic-details-dashboard.json b/dashboards/grafana/topic-details-dashboard.json
index 63b743ad0..3d94ab8dc 100644
--- a/dashboards/grafana/topic-details-dashboard.json
+++ b/dashboards/grafana/topic-details-dashboard.json
@@ -682,7 +682,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -693,8 +693,8 @@
                 "value": [
                   {
                     "targetBlank": false,
-                    "title": "Drill down to member details for ${__data.fields[3]}",
-                    "url": "/d/coh-member-details?var-MemberName=${__data.fields[3]}&$__all_variables"
+                    "title": "Drill down to member details for ${__data.fields[2]}",
+                    "url": "/d/coh-member-details?var-MemberName=${__data.fields[2]}&$__all_variables"
                   }
                 ]
               },
@@ -1106,7 +1106,7 @@
               },
               {
                 "id": "unit",
-                "value": "none"
+                "value": "string"
               },
               {
                 "id": "decimals",
@@ -1435,7 +1435,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",
diff --git a/dashboards/grafana/topic-subscriber-group-details.json b/dashboards/grafana/topic-subscriber-group-details.json
index d18740112..caa89cb93 100644
--- a/dashboards/grafana/topic-subscriber-group-details.json
+++ b/dashboards/grafana/topic-subscriber-group-details.json
@@ -272,7 +272,7 @@
               },
               {
                 "id": "unit",
-                "value": "short"
+                "value": "string"
               },
               {
                 "id": "decimals",