diff --git a/dashboards/elasticsearch-elasticsearch/elasticsearch.json b/dashboards/elasticsearch-elasticsearch/elasticsearch.json
index bf3e1d2f01..8b235b3748 100644
--- a/dashboards/elasticsearch-elasticsearch/elasticsearch.json
+++ b/dashboards/elasticsearch-elasticsearch/elasticsearch.json
@@ -332,10 +332,16 @@
         },
         "nrqlQueries" : [ {
           "accountId" : 0,
-          "query" : "FROM Metric SELECT (latest(elasticsearch.node.activeSearches) - earliest(elasticsearch.node.activeSearches))/(latest(elasticsearch.node.activeSearchesInMilliseconds) - earliest(elasticsearch.node.activeSearchesInMilliseconds)) FACET host.hostname TIMESERIES SINCE 1 WEEK AGO"
+          "query" : "FROM Metric SELECT (latest(elasticsearch.node.activeSearchesInMilliseconds) - earliest(elasticsearch.node.activeSearchesInMilliseconds))/sum(elasticsearch.node.activeSearches) FACET capture(entity.name, r'es-node:(?P<Node>.*)') TIMESERIES SINCE 1 WEEK AGO"
         } ],
+        "nullValues": {
+          "nullValue": "zero"
+        },
         "yAxisLeft" : {
           "zero" : false
+        },
+        "units": {
+          "unit": "MS"
         }
       }
     }, {
@@ -358,10 +364,16 @@
         },
         "nrqlQueries" : [ {
           "accountId" : 0,
-          "query" : "FROM Metric SELECT (latest(elasticsearch.node.get.totalGetRequests) - earliest(elasticsearch.node.get.totalGetRequests))/(latest(elasticsearch.node.get.timeGetRequestsInMilliseconds) - earliest(elasticsearch.node.get.timeGetRequestsInMilliseconds)) AS 'Total', (latest(elasticsearch.node.get.requestsDocumentExists) - earliest(elasticsearch.node.get.requestsDocumentExists))/(latest(elasticsearch.node.get.requestsDocumentExistsInMilliseconds) - earliest(elasticsearch.node.get.requestsDocumentExistsInMilliseconds)) AS 'Document Exists', (latest(elasticsearch.node.get.requestsDocumentMissing) - earliest(elasticsearch.node.get.requestsDocumentMissing))/(latest(elasticsearch.node.get.requestsDocumentMissingInMilliseconds) - earliest(elasticsearch.node.get.requestsDocumentMissingInMilliseconds)) AS 'Document Missing' FACET host.hostname TIMESERIES SINCE 1 WEEK AGO"
+          "query" : "FROM Metric SELECT (latest(elasticsearch.node.get.totalGetRequests) - earliest(elasticsearch.node.get.totalGetRequests)) / (latest(elasticsearch.node.get.timeGetRequestsInMilliseconds) - earliest(elasticsearch.node.get.timeGetRequestsInMilliseconds)) AS 'Total', (latest(elasticsearch.node.get.requestsDocumentExists) - earliest(elasticsearch.node.get.requestsDocumentExists)) / (latest(elasticsearch.node.get.requestsDocumentExistsInMilliseconds) - earliest(elasticsearch.node.get.requestsDocumentExistsInMilliseconds)) AS 'Document Exists', (latest(elasticsearch.node.get.requestsDocumentMissing) - earliest(elasticsearch.node.get.requestsDocumentMissing)) / (latest(elasticsearch.node.get.requestsDocumentMissingInMilliseconds) - earliest(elasticsearch.node.get.requestsDocumentMissingInMilliseconds)) AS 'Document Missing' FACET capture(entity.name, r'es-node:(?P<Node>.*)') TIMESERIES SINCE 1 WEEK AGO"
         } ],
+        "nullValues": {
+          "nullValue": "zero"
+        },
         "yAxisLeft" : {
           "zero" : false
+        },
+        "units": {
+          "unit": "MS"
         }
       }
     }, {
@@ -382,7 +394,7 @@
         },
         "nrqlQueries" : [ {
           "accountId" : 0,
-          "query" : "FROM Metric SELECT latest(elasticsearch.node.index.indexingOperationsFailed) - earliest(elasticsearch.node.index.indexingOperationsFailed) AS 'Failed Operations' FACET host.hostname"
+          "query" : "FROM Metric SELECT latest(elasticsearch.node.index.indexingOperationsFailed) - earliest(elasticsearch.node.index.indexingOperationsFailed) AS 'Failed Operations' FACET capture(entity.name, r'es-node:(?P<Node>.*)')"
         } ]
       }
     }, {
@@ -405,7 +417,7 @@
         },
         "nrqlQueries" : [ {
           "accountId" : 0,
-          "query" : "FROM Metric SELECT (latest(elasticsearch.node.indexing.documentsIndexed) - earliest(elasticsearch.node.indexing.documentsIndexed))/(latest(elasticsearch.node.indexing.timeIndexingDocumentsInMilliseconds) - earliest(elasticsearch.node.indexing.timeIndexingDocumentsInMilliseconds)) FACET host.hostname TIMESERIES SINCE 1 WEEK AGO"
+          "query" : "FROM Metric SELECT (latest(elasticsearch.node.indexing.documentsIndexed) - earliest(elasticsearch.node.indexing.documentsIndexed))/(latest(elasticsearch.node.indexing.timeIndexingDocumentsInMilliseconds) - earliest(elasticsearch.node.indexing.timeIndexingDocumentsInMilliseconds)) FACET capture(entity.name, r'es-node:(?P<Node>.*)') TIMESERIES SINCE 1 WEEK AGO"
         } ],
         "yAxisLeft" : {
           "zero" : false
@@ -431,8 +443,11 @@
         },
         "nrqlQueries" : [ {
           "accountId" : 0,
-          "query" : "FROM Metric SELECT (latest(elasticsearch.node.merges.segmentMerges) - earliest(elasticsearch.node.merges.segmentMerges))/(latest(elasticsearch.node.merges.totalSegmentMergingInMilliseconds) - earliest(elasticsearch.node.merges.totalSegmentMergingInMilliseconds)) FACET host.hostname TIMESERIES SINCE 1 WEEK AGO"
+          "query" : "FROM Metric SELECT (latest(elasticsearch.node.merges.totalSegmentMergingInMilliseconds) - earliest(elasticsearch.node.merges.totalSegmentMergingInMilliseconds)) / (latest(elasticsearch.node.merges.segmentMerges) - earliest(elasticsearch.node.merges.segmentMerges)) FACET capture(entity.name, r'es-node:(?P<Node>.*)') TIMESERIES SINCE 1 WEEK AGO"
         } ],
+        "nullValues": {
+          "nullValue": "zero"
+        },
         "yAxisLeft" : {
           "zero" : false
         }
@@ -457,12 +472,18 @@
         },
         "nrqlQueries" : [ {
           "accountId" : 0,
-          "query" : "FROM Metric SELECT (latest(elasticsearch.node.refresh.total) - earliest(elasticsearch.node.refresh.total))/(latest(elasticsearch.node.refresh.totalInMilliseconds) - earliest(elasticsearch.node.refresh.totalInMilliseconds)) FACET host.hostname TIMESERIES SINCE 1 WEEK AGO"
+          "query" : "FROM Metric SELECT (latest(elasticsearch.node.refresh.totalInMilliseconds) - earliest(elasticsearch.node.refresh.totalInMilliseconds))/(latest(elasticsearch.node.refresh.total) - earliest(elasticsearch.node.refresh.total)) FACET capture(entityName, r'es-node:(?P<Node>.*)') TIMESERIES SINCE 1 WEEK AGO"
         } ],
+        "nullValues": {
+          "nullValue": "zero"
+        },
         "yAxisLeft" : {
           "zero" : false
+        },
+        "units": {
+          "unit": "MS"
         }
       }
     } ]
   } ]
-}
\ No newline at end of file
+}