diff --git a/monitoring/grafana/moko-waas-dashboard.json b/monitoring/grafana/moko-waas-dashboard.json
index 784a0b2..fc60977 100644
--- a/monitoring/grafana/moko-waas-dashboard.json
+++ b/monitoring/grafana/moko-waas-dashboard.json
@@ -43,6 +43,7 @@
               "targetBlank": true
             }
           ],
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -60,15 +61,13 @@
       "gridPos": {
         "x": 0,
         "y": 1,
-        "w": 12,
-        "h": 6
+        "w": 24,
+        "h": 4
       },
       "id": 1,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -105,7 +104,7 @@
               "type": "value"
             }
           ],
-          "noValue": "N/A",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -121,17 +120,15 @@
         }
       },
       "gridPos": {
-        "x": 12,
-        "y": 1,
-        "w": 12,
+        "x": 0,
+        "y": 5,
+        "w": 24,
         "h": 4
       },
       "id": 2,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -188,16 +185,14 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 5,
-        "w": 12,
+        "y": 9,
+        "w": 24,
         "h": 4
       },
       "id": 3,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -240,17 +235,15 @@
         }
       },
       "gridPos": {
-        "x": 12,
-        "y": 5,
-        "w": 12,
+        "x": 0,
+        "y": 13,
+        "w": 24,
         "h": 4
       },
       "id": 4,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -294,7 +287,7 @@
               "targetBlank": true
             }
           ],
-          "noValue": "N/A",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -311,16 +304,14 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 9,
-        "w": 12,
+        "y": 17,
+        "w": 24,
         "h": 4
       },
       "id": 5,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -342,7 +333,7 @@
       },
       "fieldConfig": {
         "defaults": {
-          "noValue": "Never",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -355,17 +346,15 @@
         }
       },
       "gridPos": {
-        "x": 12,
-        "y": 9,
-        "w": 12,
+        "x": 0,
+        "y": 21,
+        "w": 24,
         "h": 4
       },
       "id": 6,
       "options": {
         "colorMode": "value",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -386,7 +375,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 13
+        "y": 25
       },
       "id": 101,
       "title": "Joomla Core & Updates",
@@ -399,8 +388,8 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 14,
-        "w": 12,
+        "y": 26,
+        "w": 24,
         "h": 4
       },
       "id": 10,
@@ -483,7 +472,7 @@
               "type": "value"
             }
           ],
-          "noValue": "?",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -499,17 +488,15 @@
         }
       },
       "gridPos": {
-        "x": 12,
-        "y": 14,
-        "w": 12,
+        "x": 0,
+        "y": 30,
+        "w": 24,
         "h": 4
       },
       "id": 11,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -554,16 +541,14 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 18,
-        "w": 12,
+        "y": 34,
+        "w": 24,
         "h": 4
       },
       "id": 12,
       "options": {
         "colorMode": "value",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -607,17 +592,15 @@
         }
       },
       "gridPos": {
-        "x": 12,
-        "y": 18,
-        "w": 12,
+        "x": 0,
+        "y": 38,
+        "w": 24,
         "h": 4
       },
       "id": 13,
       "options": {
         "colorMode": "value",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -670,16 +653,14 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 22,
-        "w": 12,
+        "y": 42,
+        "w": 24,
         "h": 4
       },
       "id": 14,
       "options": {
         "colorMode": "value",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -700,7 +681,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 26
+        "y": 46
       },
       "id": 102,
       "title": "Performance",
@@ -720,7 +701,7 @@
         "h": 8,
         "w": 16,
         "x": 0,
-        "y": 27
+        "y": 47
       },
       "id": 20,
       "options": {
@@ -785,7 +766,7 @@
         "h": 8,
         "w": 8,
         "x": 16,
-        "y": 27
+        "y": 47
       },
       "id": 22,
       "targets": [
@@ -807,7 +788,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 35
+        "y": 55
       },
       "id": 104,
       "title": "Backup Status",
@@ -842,7 +823,7 @@
               "targetBlank": true
             }
           ],
-          "noValue": "No Data",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -859,16 +840,14 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 36,
-        "w": 12,
+        "y": 56,
+        "w": 24,
         "h": 4
       },
       "id": 40,
       "options": {
         "colorMode": "background",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -890,7 +869,7 @@
       },
       "fieldConfig": {
         "defaults": {
-          "noValue": "?",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -911,17 +890,15 @@
         }
       },
       "gridPos": {
-        "x": 12,
-        "y": 36,
-        "w": 12,
+        "x": 0,
+        "y": 60,
+        "w": 24,
         "h": 4
       },
       "id": 41,
       "options": {
         "colorMode": "value",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -950,7 +927,7 @@
               "targetBlank": true
             }
           ],
-          "noValue": "N/A",
+          "noValue": "—",
           "thresholds": {
             "steps": [
               {
@@ -967,16 +944,14 @@
       },
       "gridPos": {
         "x": 0,
-        "y": 40,
-        "w": 12,
+        "y": 64,
+        "w": 24,
         "h": 4
       },
       "id": 42,
       "options": {
         "colorMode": "value",
-        "graphMode": "none",
-        "minVizWidth": 200,
-        "minVizHeight": 50
+        "graphMode": "none"
       },
       "targets": [
         {
@@ -997,7 +972,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 44
+        "y": 68
       },
       "id": 103,
       "title": "Uptime History",
@@ -1039,7 +1014,7 @@
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 45
+        "y": 69
       },
       "id": 30,
       "options": {
@@ -1086,7 +1061,7 @@
         "label": "Site",
         "multi": true,
         "name": "site",
-        "query": "label_values(probe_success{job=\"blackbox-http\"}, site_name)",
+        "query": "label_values(probe_success{job=\"blackbox-http\", site_type=~\"joomla.*\"}, site_name)",
         "refresh": 2,
         "sort": 1,
         "type": "query"