diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 597cead4f..00589a8b2 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -1329,9 +1329,9 @@ grafana:
         list:
           servername: {}
           role:
-            allValue: true
-            multi: true
-            hide: 0
+            allValue: false
+            multi: false
+            hide: 2
           containers: {}
           manint: {}
           monint: {}
@@ -1684,9 +1684,9 @@ grafana:
         list:
           servername: {}
           role:
-            allValue: true
-            multi: true
-            hide: 0
+            allValue: false
+            multi: false
+            hide: 2
           containers: {}
           manint: {}
           monint: {}
@@ -1973,9 +1973,9 @@ grafana:
         list:
           servername: {}
           role:
-            allValue: true
-            multi: true
-            hide: 0
+            allValue: false
+            multi: false
+            hide: 2
           containers: {}
           manint: {}
           monint: {}
diff --git a/salt/grafana/templates/servername.json b/salt/grafana/templates/servername.json
index 1235747a3..aaa90acfc 100644
--- a/salt/grafana/templates/servername.json
+++ b/salt/grafana/templates/servername.json
@@ -12,7 +12,7 @@
       "value": [{{ TEMPLATES.servername.get('value', '')| json }}]
     },
     "datasource": "InfluxDB",
-    "definition": "{{ query   }}",
+    "definition": "{{ query }}",
     "description": "",
     "error": null,
     "hide": 0,