diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 28c0463..c4c9f9b 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.8
+version: 0.2.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm/dashboards/econet-exporter.json b/helm/dashboards/econet-exporter.json
index 38fe577..0470cd6 100644
--- a/helm/dashboards/econet-exporter.json
+++ b/helm/dashboards/econet-exporter.json
@@ -1348,7 +1348,7 @@
         {
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_usage_kwh[$__range]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_usage_kwh[$__range]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}",
           "range": false,
@@ -1518,7 +1518,7 @@
         {
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[12h]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[12h]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}: 12h Cost",
           "range": false,
@@ -1531,7 +1531,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[24h]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[24h]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "hide": false,
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}: 24h Cost",
@@ -1545,7 +1545,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[2d]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[2d]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "hide": false,
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}: 2d Cost",
@@ -1559,7 +1559,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[7d]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[7d]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "hide": false,
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}: 7d Cost",
@@ -1573,7 +1573,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[30d]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[30d]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "hide": false,
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}: 30d Cost",
@@ -1672,7 +1672,7 @@
         {
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[$__range]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  econet_device_info{econet_friendly_name=~\"$device\"}\n)",
+          "expr": "sum by (econet_friendly_name) (\n  increase(econet_energy_cost_dollars[$__range]) \n  * on(econet_serial) group_left(econet_friendly_name) \n  (max by (econet_serial, econet_friendly_name) (econet_device_info{econet_friendly_name=~\"$device\"}))\n)",
           "instant": true,
           "legendFormat": "{{econet_friendly_name}}",
           "range": false,
@@ -1934,5 +1934,5 @@
   "timezone": "",
   "title": "EcoNet Water Heater",
   "uid": "econet-exporter",
-  "version": 3
+  "version": 5
 }