diff --git a/public/configurations/queries/vss-domain-flow-table-pg.json b/public/configurations/queries/vss-domain-flow-table-pg.json
index a793022f..89c6da3e 100644
--- a/public/configurations/queries/vss-domain-flow-table-pg.json
+++ b/public/configurations/queries/vss-domain-flow-table-pg.json
@@ -98,14 +98,14 @@
                     {"term": {"{{domainType:nuage_metadata.domainName}}": "{{domainName}}"} },
                     {
                       "nested": {
-                        "path": "{{destination_field:nuage_metadata.dst-pgmem-info}}",
+                        "path": "{{destination_field:nuage_metadata.src-pgmem-info}}",
                         "score_mode": "none",
                         "query": {
                           "bool": {
                             "must": [
                               {
                                 "match": {
-                                  "{{source_field:nuage_metadata.dst-pgmem-info}}.name": "{{destination}}"
+                                  "{{source_field:nuage_metadata.src-pgmem-info}}.name": "{{destination}}"
                                 }
                               }
                             ]
diff --git a/public/configurations/queries/vss-enterprise-acldeny-metric.json b/public/configurations/queries/vss-enterprise-acldeny-metric.json
index e02f2b04..0d2ddb16 100644
--- a/public/configurations/queries/vss-enterprise-acldeny-metric.json
+++ b/public/configurations/queries/vss-enterprise-acldeny-metric.json
@@ -30,16 +30,16 @@
                             "Prev 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{prevStartTime:now-48h}}",
-                                        "lte": "{{startTime:now-24h}}"
+                                        "gte": "now-48h",
+                                        "lte": "now-24h"
                                     }
                                 }
                             },
                             "Last 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{startTime:now-24h}}",
-                                        "lte": "{{endTime:now}}"
+                                        "gte": "now-24h",
+                                        "lte": "now"
                                     }
                                 }
                             }
diff --git a/public/configurations/queries/vss-enterprise-alerts-metric.json b/public/configurations/queries/vss-enterprise-alerts-metric.json
index a457630f..0681c398 100644
--- a/public/configurations/queries/vss-enterprise-alerts-metric.json
+++ b/public/configurations/queries/vss-enterprise-alerts-metric.json
@@ -38,8 +38,8 @@
                      "Last 24":{
                         "range":{
                            "timestamp":{
-                              "gte":"{{startTime:now-24h}}",
-                              "lte":"{{endTime:now}}"
+                              "gte":"now-24h",
+                              "lte":"now"
                            }
                         }
                      }
diff --git a/public/configurations/queries/vss-enterprise-events-metric.json b/public/configurations/queries/vss-enterprise-events-metric.json
index c01061b7..4a2fb4a8 100644
--- a/public/configurations/queries/vss-enterprise-events-metric.json
+++ b/public/configurations/queries/vss-enterprise-events-metric.json
@@ -25,16 +25,16 @@
                             "Prev 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{prevStartTime:now-48h}}",
-                                        "lte": "{{startTime:now-24h}}"
+                                        "gte": "now-48h",
+                                        "lte": "now-24h"
                                     }
                                 }
                             },
                             "Last 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{startTime:now-24h}}",
-                                        "lte": "{{endTime:now}}"
+                                        "gte": "now-24h",
+                                        "lte": "now"
                                     }
                                 }
                             }
diff --git a/public/configurations/queries/vss-enterprise-flows-metric.json b/public/configurations/queries/vss-enterprise-flows-metric.json
index ebe9f6d8..a02ea8c2 100644
--- a/public/configurations/queries/vss-enterprise-flows-metric.json
+++ b/public/configurations/queries/vss-enterprise-flows-metric.json
@@ -25,16 +25,16 @@
                             "Prev 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{prevStartTime:now-48h}}",
-                                        "lte": "{{startTime:now-24h}}"
+                                        "gte": "now-48h",
+                                        "lte": "now-24h"
                                     }
                                 }
                             },
                             "Last 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{startTime:now-24h}}",
-                                        "lte": "{{endTime:now}}"
+                                        "gte": "now-24h",
+                                        "lte": "now"
                                     }
                                 }
                             }
diff --git a/public/configurations/queries/vss-enterprise-pg-metric.json b/public/configurations/queries/vss-enterprise-pg-metric.json
index 8c64f4b3..e0f24895 100644
--- a/public/configurations/queries/vss-enterprise-pg-metric.json
+++ b/public/configurations/queries/vss-enterprise-pg-metric.json
@@ -25,16 +25,16 @@
                             "Prev 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{prevStartTime:now-48h}}",
-                                        "lte": "{{startTime:now-24h}}"
+                                        "gte": "now-48h",
+                                        "lte": "now-24h"
                                     }
                                 }
                             },
                             "Last 24": {
                                 "range": {
                                     "timestamp": {
-                                        "gte": "{{startTime:now-24h}}",
-                                        "lte": "{{endTime:now}}"
+                                        "gte": "now-24h",
+                                        "lte": "now"
                                     }
                                 }
                             }
diff --git a/public/configurations/queries/vss-top-domains-blocked-traffic.json b/public/configurations/queries/vss-top-domains-blocked-traffic.json
index 57768a36..6d289e91 100644
--- a/public/configurations/queries/vss-top-domains-blocked-traffic.json
+++ b/public/configurations/queries/vss-top-domains-blocked-traffic.json
@@ -1,27 +1,27 @@
 {
-    "id":"vss-topdomains-blocked-traffic",
-    "title":"Top Domains with Blocked Traffic",
-    "service":"elasticsearch",
-    "query":{
-        "index":"{{index:nuage_flow}}",
-        "type":"{{type:nuage_doc_type}}",
-        "body":{
-            "size":0,
-            "query":{
-                "bool":{
-                    "must":[
+    "id": "vss-topdomains-blocked-traffic",
+    "title": "Top Domains with Blocked Traffic",
+    "service": "elasticsearch",
+    "query": {
+        "index": "{{index:nuage_flow}}",
+        "type": "{{type:nuage_doc_type}}",
+        "body": {
+            "size": 0,
+            "query": {
+                "bool": {
+                    "must": [
                         {
-                            "range":{
-                                "timestamp":{
-                                    "gte":"{{startTime:now-24h}}",
-                                    "lte":"{{endTime:now}}",
-                                    "format":"epoch_millis"
+                            "range": {
+                                "timestamp": {
+                                    "gte": "{{startTime:now-24h}}",
+                                    "lte": "{{endTime:now}}",
+                                    "format": "epoch_millis"
                                 }
                             }
                         },
                         {
                             "term": {
-                                "nuage_metadata.enterpriseName":"{{enterpriseName:chord_enterprise}}"
+                                "nuage_metadata.enterpriseName": "{{enterpriseName:chord_enterprise}}"
                             }
                         },
                         {
@@ -35,7 +35,10 @@
             "aggs": {
                 "domains": {
                     "terms": {
-                        "field": "nuage_metadata.domainName",
+                        "script": {
+                            "inline": "doc['nuage_metadata.l2domainName'].value ?: doc['nuage_metadata.domainName']",
+                            "lang": "painless"
+                        },
                         "size": 5,
                         "order": {
                             "SumOf": "desc"
@@ -52,4 +55,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/public/configurations/visualizations/vss-domain-events-detail.json b/public/configurations/visualizations/vss-domain-events-detail.json
index bc0029ad..b7427127 100644
--- a/public/configurations/visualizations/vss-domain-events-detail.json
+++ b/public/configurations/visualizations/vss-domain-events-detail.json
@@ -14,5 +14,5 @@
             { "column": "nuage_metadata.zoneName", "label": "Zone Name" }
         ]
     },
-    "query": "vss-domain-events-detail"
+    "query": {"data":{"name":"vss-domain-events-detail","scroll":true}}
 }
diff --git a/public/configurations/visualizations/vss-domain-flow-flow-metric.json b/public/configurations/visualizations/vss-domain-flow-flow-metric.json
index 5ae0b122..cd3d93cf 100644
--- a/public/configurations/visualizations/vss-domain-flow-flow-metric.json
+++ b/public/configurations/visualizations/vss-domain-flow-flow-metric.json
@@ -10,7 +10,7 @@
             "column": "timezones",
             "value": "Last 24",
             "field": "value",
-            "format": ",.4s"
+            "format": "s"
         }
     }
 }
diff --git a/public/configurations/visualizations/vss-enterprise-acldeny-metric.json b/public/configurations/visualizations/vss-enterprise-acldeny-metric.json
index 3081816e..9a741dd4 100644
--- a/public/configurations/visualizations/vss-enterprise-acldeny-metric.json
+++ b/public/configurations/visualizations/vss-enterprise-acldeny-metric.json
@@ -9,7 +9,7 @@
             "column": "timezones",
             "value": "Last 24",
             "field": "doc_count",
-            "format": ",.4s"
+            "format": "s"
         }
     }
 }
diff --git a/public/configurations/visualizations/vss-enterprise-alerts-metric.json b/public/configurations/visualizations/vss-enterprise-alerts-metric.json
index 405d999d..b453d93e 100644
--- a/public/configurations/visualizations/vss-enterprise-alerts-metric.json
+++ b/public/configurations/visualizations/vss-enterprise-alerts-metric.json
@@ -9,7 +9,7 @@
             "column": "timezones",
             "value": "Last 24",
             "field": "doc_count",
-            "format": ",.4s"
+            "format": "s"
         }
     }
 }
diff --git a/public/configurations/visualizations/vss-enterprise-events-metric.json b/public/configurations/visualizations/vss-enterprise-events-metric.json
index 3859e0e6..bb8247c4 100644
--- a/public/configurations/visualizations/vss-enterprise-events-metric.json
+++ b/public/configurations/visualizations/vss-enterprise-events-metric.json
@@ -9,7 +9,7 @@
             "column": "timezones",
             "value": "Last 24",
             "field": "doc_count",
-            "format": ",.4s"
+            "format": "s"
         }
     }
 }
diff --git a/public/configurations/visualizations/vss-enterprise-pg-metric.json b/public/configurations/visualizations/vss-enterprise-pg-metric.json
index 9c4a0fcc..0bff7479 100644
--- a/public/configurations/visualizations/vss-enterprise-pg-metric.json
+++ b/public/configurations/visualizations/vss-enterprise-pg-metric.json
@@ -9,7 +9,7 @@
             "column": "timezones",
             "value": "Last 24",
             "field": "value",
-            "format": ",.4s"
+            "format": "s"
         }
     }
 }