diff --git a/aerospike/AerospikeHDFDashboard.json b/aerospike/AerospikeHDFDashboard.json
index 1c90073c..78c33b14 100644
--- a/aerospike/AerospikeHDFDashboard.json
+++ b/aerospike/AerospikeHDFDashboard.json
@@ -131,11 +131,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
+          "calcs": [],
           "fields": "dataset",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -206,11 +204,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
+          "calcs": [],
           "fields": "idxdist",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -281,11 +277,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
+          "calcs": [],
           "fields": "poprecs",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -356,11 +350,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
+          "calcs": [],
           "fields": "dims",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -434,7 +426,7 @@
             "lastNotNull"
           ],
           "fields": "hnswparams",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -524,7 +516,7 @@
         "reduceOptions": {
           "calcs": [],
           "fields": "",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -597,7 +589,7 @@
         "reduceOptions": {
           "calcs": [],
           "fields": "/^fullname$/",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -670,7 +662,7 @@
         "reduceOptions": {
           "calcs": [],
           "fields": "/^fullname$/",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -701,7 +693,7 @@
       "type": "stat"
     },
     {
-      "collapsed": false,
+      "collapsed": true,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -709,131 +701,132 @@
         "y": 9
       },
       "id": 660,
-      "panels": [],
-      "title": "Exceptions",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": -1,
-            "drawStyle": "line",
-            "fillOpacity": 16,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "stepAfter",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 0,
-          "fieldMinMax": false,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "locale"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 13,
-        "w": 24,
-        "x": 0,
-        "y": 10
-      },
-      "id": 640,
-      "options": {
-        "legend": {
-          "calcs": [
-            "max",
-            "lastNotNull"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "10.4.2",
-      "targets": [
+      "panels": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "aerospike_hdf_exception{ns=\"$idxns\", instance=~\"$client\", idx=\"$idxname\", run=~\"$QueryRun\"}",
-          "format": "time_series",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "{{instance}} - {{ns}}.{{idx}} Run: {{run}} {{exception_type}}",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisBorderShow": false,
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": -1,
+                "drawStyle": "line",
+                "fillOpacity": 16,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "insertNulls": false,
+                "lineInterpolation": "stepAfter",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "decimals": 0,
+              "fieldMinMax": false,
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  }
+                ]
+              },
+              "unit": "locale"
+            },
+            "overrides": []
           },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "aerospike_hdf_exception{ns=\"$namespace\", instance=~\"$client\", set=\"$set\"}",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "{{instance}} - {{ns}}.{{set}} {{exception_type}}",
-          "range": true,
-          "refId": "B",
-          "useBackend": false
+          "gridPos": {
+            "h": 13,
+            "w": 24,
+            "x": 0,
+            "y": 10
+          },
+          "id": 640,
+          "options": {
+            "legend": {
+              "calcs": [
+                "max",
+                "lastNotNull"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "multi",
+              "sort": "none"
+            }
+          },
+          "pluginVersion": "10.4.2",
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "${DS_PROMETHEUS}"
+              },
+              "disableTextWrap": false,
+              "editorMode": "code",
+              "exemplar": false,
+              "expr": "aerospike_hdf_exception{ns=\"$idxns\", instance=~\"$client\", idx=\"$idxname\", run=~\"$QueryRun\"}",
+              "format": "time_series",
+              "fullMetaSearch": false,
+              "includeNullMetadata": true,
+              "instant": false,
+              "legendFormat": "{{instance}} - {{ns}}.{{idx}} Run: {{run}} {{exception_type}}",
+              "range": true,
+              "refId": "A",
+              "useBackend": false
+            },
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "${DS_PROMETHEUS}"
+              },
+              "disableTextWrap": false,
+              "editorMode": "code",
+              "expr": "aerospike_hdf_exception{ns=\"$namespace\", instance=~\"$client\", set=\"$set\"}",
+              "fullMetaSearch": false,
+              "hide": false,
+              "includeNullMetadata": true,
+              "instant": false,
+              "legendFormat": "{{instance}} - {{ns}}.{{set}} {{exception_type}}",
+              "range": true,
+              "refId": "B",
+              "useBackend": false
+            }
+          ],
+          "title": "Exceptions",
+          "type": "timeseries"
         }
       ],
       "title": "Exceptions",
-      "type": "timeseries"
+      "type": "row"
     },
     {
       "collapsed": false,
@@ -841,7 +834,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 23
+        "y": 10
       },
       "id": 651,
       "panels": [],
@@ -904,7 +897,7 @@
         "h": 5,
         "w": 3,
         "x": 0,
-        "y": 24
+        "y": 11
       },
       "id": 649,
       "options": {
@@ -913,11 +906,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
+          "calcs": [],
           "fields": "paused",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "auto",
@@ -981,7 +972,7 @@
         "h": 5,
         "w": 3,
         "x": 3,
-        "y": 24
+        "y": 11
       },
       "id": 626,
       "options": {
@@ -991,7 +982,7 @@
         "reduceOptions": {
           "calcs": [],
           "fields": "",
-          "values": true
+          "values": false
         },
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
@@ -1157,7 +1148,7 @@
         "h": 9,
         "w": 24,
         "x": 0,
-        "y": 29
+        "y": 16
       },
       "id": 638,
       "options": {
@@ -1221,7 +1212,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 38
+        "y": 25
       },
       "id": 652,
       "panels": [],
@@ -1260,7 +1251,7 @@
         "h": 5,
         "w": 3,
         "x": 0,
-        "y": 39
+        "y": 26
       },
       "id": 646,
       "options": {
@@ -1269,11 +1260,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
+          "calcs": [],
           "fields": "queryruns",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -1335,7 +1324,7 @@
         "h": 5,
         "w": 3,
         "x": 3,
-        "y": 39
+        "y": 26
       },
       "id": 650,
       "options": {
@@ -1344,11 +1333,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
+          "calcs": [],
           "fields": "queries",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -1410,7 +1397,7 @@
         "h": 5,
         "w": 3,
         "x": 6,
-        "y": 39
+        "y": 26
       },
       "id": 647,
       "options": {
@@ -1419,11 +1406,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
+          "calcs": [],
           "fields": "querynbrlmt",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -1484,7 +1469,7 @@
         "h": 5,
         "w": 2,
         "x": 9,
-        "y": 39
+        "y": 26
       },
       "id": 659,
       "options": {
@@ -1495,7 +1480,7 @@
         "reduceOptions": {
           "calcs": [],
           "fields": "queryef",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "textMode": "value",
@@ -1558,7 +1543,7 @@
         "h": 5,
         "w": 3,
         "x": 11,
-        "y": 39
+        "y": 26
       },
       "id": 648,
       "options": {
@@ -1568,7 +1553,7 @@
         "reduceOptions": {
           "calcs": [],
           "fields": "",
-          "values": true
+          "values": false
         },
         "showThresholdLabels": false,
         "showThresholdMarkers": false,
@@ -1678,7 +1663,7 @@
         "h": 5,
         "w": 2,
         "x": 14,
-        "y": 39
+        "y": 26
       },
       "id": 653,
       "options": {
@@ -1687,11 +1672,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
-          "fields": "querymetric",
-          "values": true
+          "calcs": [],
+          "fields": "/^recalltype$/",
+          "values": false
         },
         "showPercentChange": false,
         "text": {},
@@ -1706,9 +1689,9 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
+          "editorMode": "code",
           "exemplar": false,
-          "expr": "aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}",
+          "expr": "label_join(aerospike_hdf_heartbeat{idx=\"$idxname\", instance=~\"$client\", idxns=\"$idxns\"}, \"recalltype\", \"-\", \"anndist\",\"querymetric\")",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -1769,7 +1752,7 @@
         "h": 5,
         "w": 2,
         "x": 16,
-        "y": 39
+        "y": 26
       },
       "id": 654,
       "options": {
@@ -1778,11 +1761,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
+          "calcs": [],
           "fields": "querymetricvalue",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "text": {},
@@ -1860,7 +1841,7 @@
         "h": 5,
         "w": 3,
         "x": 18,
-        "y": 39
+        "y": 26
       },
       "id": 661,
       "options": {
@@ -1869,11 +1850,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
+          "calcs": [],
           "fields": "querymetricaerospikevalue",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "text": {},
@@ -1951,7 +1930,7 @@
         "h": 5,
         "w": 3,
         "x": 21,
-        "y": 39
+        "y": 26
       },
       "id": 657,
       "options": {
@@ -1960,11 +1939,9 @@
         "justifyMode": "auto",
         "orientation": "auto",
         "reduceOptions": {
-          "calcs": [
-            "firstNotNull"
-          ],
+          "calcs": [],
           "fields": "/^querymetricbigvalue$/",
-          "values": true
+          "values": false
         },
         "showPercentChange": false,
         "text": {},
@@ -2059,7 +2036,7 @@
         "h": 13,
         "w": 24,
         "x": 0,
-        "y": 44
+        "y": 31
       },
       "id": 610,
       "options": {
@@ -2156,7 +2133,7 @@
         "h": 15,
         "w": 24,
         "x": 0,
-        "y": 57
+        "y": 44
       },
       "id": 656,
       "options": {
@@ -2261,10 +2238,6 @@
       },
       {
         "current": {},
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${DS_PROMETHEUS}"
-        },
         "definition": "label_values(aerospike_hdf_heartbeat,ns)",
         "hide": 0,
         "includeAll": true,
@@ -2413,6 +2386,6 @@
   "timezone": "",
   "title": "Aerospike HDF",
   "uid": "fzUPYeJIkhdf",
-  "version": 12,
+  "version": 18,
   "weekStart": ""
 }
\ No newline at end of file