diff --git a/PDNS recursor stats-1735471624512.json b/PDNS recursor stats-1735471624512.json
index d8cad2e..4184d85 100644
--- a/PDNS recursor stats-1735471624512.json	
+++ b/PDNS recursor stats-1735471624512.json	
@@ -295,7 +295,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_cache_hits{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_cache_hits{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "hits",
@@ -309,7 +309,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_cache_misses{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_cache_misses{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "misses",
@@ -323,7 +323,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_cache_entries{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_cache_entries{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "entries",
@@ -338,7 +338,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_negcache_entries{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_negcache_entries{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "negative",
@@ -476,7 +476,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers0_1{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers0_1{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "0-1 ms",
@@ -490,7 +490,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers1_10{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers1_10{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "1-10 ms",
@@ -504,7 +504,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers10_100{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers10_100{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "10-100 ms",
@@ -519,7 +519,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum  (rate(pdns_recursor_answers100_1000{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum  (rate(pdns_recursor_answers100_1000{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "100-1000 ms",
@@ -533,7 +533,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers_slow{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers_slow{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "slow",
@@ -682,7 +682,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum(rate(pdns_recursor_qa_latency{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "pdns_recursor_qa_latency{job=\"$job\",instance=~\"$recursor\"}",
           "interval": "",
           "intervalFactor": 4,
           "legendFormat": "$recursor",
@@ -844,7 +844,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum  (rate(pdns_recursor_questions{job=\"$job\",instance=~\"$recursor\"}[$T]) + rate(pdns_recursor_ipv6_questions{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum  (rate(pdns_recursor_questions{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]) + rate(pdns_recursor_ipv6_questions{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 4,
           "legendFormat": "$recursor",
@@ -1081,7 +1081,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers0_1{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers0_1{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "0-1 ms",
@@ -1095,7 +1095,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers1_10{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers1_10{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "1-10 ms",
@@ -1109,7 +1109,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers10_100{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers10_100{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "10-100 ms",
@@ -1124,7 +1124,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum  (rate(pdns_recursor_answers100_1000{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum  (rate(pdns_recursor_answers100_1000{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "100-1000 ms",
@@ -1138,7 +1138,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_answers_slow{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_answers_slow{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "slow",
@@ -1211,8 +1211,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1297,7 +1296,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum(rate(pdns_recursor_all_outqueries{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum(rate(pdns_recursor_all_outqueries{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 4,
               "legendFormat": "$recursor",
@@ -1359,8 +1358,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1439,7 +1437,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(pdns_recursor_servfail_answers{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum (rate(pdns_recursor_servfail_answers{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "SERVFAIL",
@@ -1453,7 +1451,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(pdns_recursor_nxdomain_answers{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum (rate(pdns_recursor_nxdomain_answers{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "NXDomain",
@@ -1467,7 +1465,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(pdns_recursor_failed_host_entries{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum (rate(pdns_recursor_failed_host_entries{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "Failed host",
@@ -1481,7 +1479,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(pdns_recursor_unauthorized_udp{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum (rate(pdns_recursor_unauthorized_udp{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "Unauthorized UDP",
@@ -1495,7 +1493,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(pdns_recursor_outgoing_timeouts{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum (rate(pdns_recursor_outgoing_timeouts{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "Timeout",
@@ -1509,7 +1507,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum (rate(pdns_recursor_policy_result_noaction{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum (rate(pdns_recursor_policy_result_noaction{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 2,
               "legendFormat": "No action",
@@ -1572,8 +1570,7 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green",
-                    "value": null
+                    "color": "green"
                   },
                   {
                     "color": "red",
@@ -1652,7 +1649,7 @@
                 "uid": "${DS_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "sum  (rate(pdns_recursor_ipv6_outqueries{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+              "expr": "sum  (rate(pdns_recursor_ipv6_outqueries{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
               "interval": "",
               "intervalFactor": 4,
               "legendFormat": "$recursor",
@@ -1811,7 +1808,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_cpu_msec_thread_0{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_cpu_msec_thread_0{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "CPU thread 0",
@@ -1825,7 +1822,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_cpu_msec_thread_1{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_cpu_msec_thread_1{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "CPU thread 1",
@@ -1839,7 +1836,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_cpu_msec_thread_2{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_cpu_msec_thread_2{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "CPU thread 2",
@@ -1853,7 +1850,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_sys_msec{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_sys_msec{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "System mode",
@@ -1867,7 +1864,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum (rate(pdns_recursor_user_msec{job=\"$job\",instance=~\"$recursor\"}[$T]))",
+          "expr": "sum (rate(pdns_recursor_user_msec{job=\"$job\",instance=~\"$recursor\"}[$__rate_interval]))",
           "interval": "",
           "intervalFactor": 2,
           "legendFormat": "User mode",
@@ -1989,86 +1986,6 @@
   ],
   "templating": {
     "list": [
-      {
-        "auto": false,
-        "auto_count": 30,
-        "auto_min": "60s",
-        "current": {
-          "selected": false,
-          "text": "5m",
-          "value": "5m"
-        },
-        "hide": 0,
-        "label": "Interval",
-        "name": "T",
-        "options": [
-          {
-            "selected": false,
-            "text": "1m",
-            "value": "1m"
-          },
-          {
-            "selected": false,
-            "text": "2m",
-            "value": "2m"
-          },
-          {
-            "selected": true,
-            "text": "5m",
-            "value": "5m"
-          },
-          {
-            "selected": false,
-            "text": "10m",
-            "value": "10m"
-          },
-          {
-            "selected": false,
-            "text": "30m",
-            "value": "30m"
-          },
-          {
-            "selected": false,
-            "text": "1h",
-            "value": "1h"
-          },
-          {
-            "selected": false,
-            "text": "6h",
-            "value": "6h"
-          },
-          {
-            "selected": false,
-            "text": "12h",
-            "value": "12h"
-          },
-          {
-            "selected": false,
-            "text": "1d",
-            "value": "1d"
-          },
-          {
-            "selected": false,
-            "text": "7d",
-            "value": "7d"
-          },
-          {
-            "selected": false,
-            "text": "14d",
-            "value": "14d"
-          },
-          {
-            "selected": false,
-            "text": "30d",
-            "value": "30d"
-          }
-        ],
-        "query": "1m,2m,5m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
-        "queryValue": "",
-        "refresh": 2,
-        "skipUrlSync": false,
-        "type": "interval"
-      },
       {
         "current": {},
         "datasource": {
@@ -2094,6 +2011,10 @@
       },
       {
         "current": {},
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_PROMETHEUS}"
+        },
         "definition": "label_values(pdns_recursor_cpu_msec,job)",
         "hide": 0,
         "includeAll": true,
@@ -2114,7 +2035,7 @@
     ]
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-24h",
     "to": "now"
   },
   "timepicker": {
@@ -2142,8 +2063,8 @@
     ]
   },
   "timezone": "browser",
-  "title": "PDNS recursor stats",
-  "uid": "000000044",
-  "version": 12,
+  "title": "PDNS recursor",
+  "uid": "000000045",
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file