diff --git a/config/cariflex-dashboard.json b/config/cariflex-dashboard.json
index 8d1390b..b9f35aa 100644
--- a/config/cariflex-dashboard.json
+++ b/config/cariflex-dashboard.json
@@ -15,7 +15,7 @@
         "gridPos": {"h": 8, "w": 12, "x": 0, "y": 0},
         "datasource": {"type": "postgres", "uid": "a9b60854-60c5-4c86-bb0b-d98852df0c89"},
         "targets": [{
-          "rawSql": "SELECT event_start as time, SUM(event_value) as power_kw FROM timed_belief WHERE sensor_id BETWEEN 41 AND 50 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY event_start ORDER BY event_start",
+          "rawSql": "SELECT EXTRACT(EPOCH FROM event_start) * 1000 as time, SUM(event_value) as power_kw FROM timed_belief WHERE sensor_id BETWEEN 41 AND 50 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY 1 ORDER BY 1",
           "refId": "A"
         }],
         "fieldConfig": {"defaults": {"unit": "kW", "min": 0, "max": 50}}
@@ -27,7 +27,7 @@
         "gridPos": {"h": 8, "w": 12, "x": 12, "y": 0},
         "datasource": {"type": "postgres", "uid": "a9b60854-60c5-4c86-bb0b-d98852df0c89"},
         "targets": [{
-          "rawSql": "SELECT event_start as time, SUM(event_value) as power_kw FROM timed_belief WHERE sensor_id BETWEEN 61 AND 70 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY event_start ORDER BY event_start",
+          "rawSql": "SELECT EXTRACT(EPOCH FROM event_start) * 1000 as time, SUM(event_value) as power_kw FROM timed_belief WHERE sensor_id BETWEEN 61 AND 70 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY 1 ORDER BY 1",
           "refId": "A"
         }],
         "fieldConfig": {"defaults": {"unit": "kW", "min": 0, "max": 220}}
@@ -39,7 +39,7 @@
         "gridPos": {"h": 8, "w": 8, "x": 0, "y": 8},
         "datasource": {"type": "postgres", "uid": "a9b60854-60c5-4c86-bb0b-d98852df0c89"},
         "targets": [{
-          "rawSql": "SELECT event_start as time, AVG(event_value) as soc_kwh FROM timed_belief WHERE sensor_id BETWEEN 51 AND 60 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY event_start ORDER BY event_start",
+          "rawSql": "SELECT EXTRACT(EPOCH FROM event_start) * 1000 as time, AVG(event_value) as soc_kwh FROM timed_belief WHERE sensor_id BETWEEN 51 AND 60 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY 1 ORDER BY 1",
           "refId": "A"
         }],
         "fieldConfig": {"defaults": {"unit": "kWh", "min": 0, "max": 100}}
@@ -51,7 +51,7 @@
         "gridPos": {"h": 8, "w": 8, "x": 8, "y": 8},
         "datasource": {"type": "postgres", "uid": "a9b60854-60c5-4c86-bb0b-d98852df0c89"},
         "targets": [{
-          "rawSql": "SELECT event_start as time, AVG(event_value) as soc_kwh FROM timed_belief WHERE sensor_id BETWEEN 71 AND 80 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY event_start ORDER BY event_start",
+          "rawSql": "SELECT EXTRACT(EPOCH FROM event_start) * 1000 as time, AVG(event_value) as soc_kwh FROM timed_belief WHERE sensor_id BETWEEN 71 AND 80 AND event_start > NOW() - INTERVAL '24 hours' GROUP BY 1 ORDER BY 1",
           "refId": "A"
         }],
         "fieldConfig": {"defaults": {"unit": "kWh", "min": 0, "max": 75}}
@@ -63,7 +63,7 @@
         "gridPos": {"h": 8, "w": 8, "x": 16, "y": 8},
         "datasource": {"type": "postgres", "uid": "a9b60854-60c5-4c86-bb0b-d98852df0c89"},
         "targets": [{
-          "rawSql": "SELECT SUM(event_value) as flex_kw FROM timed_belief WHERE sensor_id BETWEEN 51 AND 80 AND event_start > NOW() - INTERVAL '1 hour' GROUP BY sensor_id ORDER BY event_start DESC LIMIT 1",
+          "rawSql": "SELECT EXTRACT(EPOCH FROM NOW()) * 1000 as time, SUM(event_value) as flex_kw FROM timed_belief WHERE sensor_id BETWEEN 51 AND 80 AND event_start > NOW() - INTERVAL '1 hour'",
           "refId": "A"
         }],
         "fieldConfig": {"defaults": {"unit": "kW", "min": 0}}