diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index fa3e6ea..667fe34 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.2
+version: 0.2.3
 
 # 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 b09eb5c..dcd2a2c 100644
--- a/helm/dashboards/econet-exporter.json
+++ b/helm/dashboards/econet-exporter.json
@@ -105,7 +105,8 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_connected{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_connected{econet_friendly_name=~\"$device\"})",
+          "instant": true,
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -146,9 +147,9 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_running{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_running{econet_friendly_name=~\"$device\"})",
           "instant": true,
-          "legendFormat": "{{econet_running_state}}",
+          "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
       ],
@@ -179,7 +180,8 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_mode{econet_friendly_name=~\"$device\"} == 1",
+          "expr": "max by (econet_friendly_name, econet_mode) (econet_mode{econet_friendly_name=~\"$device\"}) == 1",
+          "instant": true,
           "legendFormat": "{{econet_mode}}",
           "refId": "A"
         }
@@ -219,7 +221,8 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"}",
+          "expr": "avg by (econet_friendly_name) (econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"})",
+          "instant": true,
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -259,7 +262,8 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"}",
+          "expr": "avg by (econet_friendly_name) (econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"})",
+          "instant": true,
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -298,7 +302,8 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_alert_count{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_alert_count{econet_friendly_name=~\"$device\"})",
+          "instant": true,
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -361,19 +366,19 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"}",
+          "expr": "avg by (econet_friendly_name) (econet_setpoint_fahrenheit{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}} setpoint",
           "refId": "A"
         },
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_setpoint_min_fahrenheit{econet_friendly_name=~\"$device\"}",
+          "expr": "min by (econet_friendly_name) (econet_setpoint_min_fahrenheit{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}} min",
           "refId": "B"
         },
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_setpoint_max_fahrenheit{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_setpoint_max_fahrenheit{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}} max",
           "refId": "C"
         }
@@ -421,7 +426,7 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"}",
+          "expr": "avg by (econet_friendly_name) (econet_hot_water_availability_percent{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -475,7 +480,7 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_energy_usage_kwh * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_energy_usage_kwh * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -521,7 +526,7 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_energy_cost_dollars * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_energy_cost_dollars * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -567,7 +572,7 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_water_usage_gallons * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"}",
+          "expr": "max by (econet_friendly_name) (econet_water_usage_gallons * on(econet_serial) group_left(econet_friendly_name) econet_device_info{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
@@ -616,8 +621,8 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_running{econet_friendly_name=~\"$device\"}",
-          "legendFormat": "{{econet_friendly_name}} ({{econet_running_state}})",
+          "expr": "max by (econet_friendly_name) (econet_running{econet_friendly_name=~\"$device\"})",
+          "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }
       ],
@@ -662,7 +667,7 @@
       "targets": [
         {
           "datasource": { "type": "prometheus", "uid": "${datasource}" },
-          "expr": "econet_wifi_signal_db{econet_friendly_name=~\"$device\"}",
+          "expr": "avg by (econet_friendly_name) (econet_wifi_signal_db{econet_friendly_name=~\"$device\"})",
           "legendFormat": "{{econet_friendly_name}}",
           "refId": "A"
         }