diff --git a/salt/grafana/templates/servername_all.json b/salt/grafana/templates/servername_all.json
index 806363ce0..c6c1c80f4 100644
--- a/salt/grafana/templates/servername_all.json
+++ b/salt/grafana/templates/servername_all.json
@@ -1,21 +1,26 @@
 {
     "allValue": null,
-    "current": {},
+    "current": {
+      "selected": true,
+      "tags": [],
+      "text": [],
+      "value": []
+    },
     "datasource": "InfluxDB",
     "definition": "show tag values with key=\"host\"",
     "description": "",
     "error": null,
     "hide": 0,
-    "includeAll": false,
+    "includeAll": true,
     "label": "Node",
-    "multi": false,
+    "multi": true,
     "name": "servername",
     "options": [],
     "query": "show tag values with key=\"host\"",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,
-    "sort": 0,
+    "sort": 1,
     "tagValuesQuery": "",
     "tags": [],
     "tagsQuery": "",