diff --git a/dashboards/jfr-dashboard-export-share-0.5.json b/dashboards/jfr-dashboard-export-share-0.5.json
index f82042f..e6c06ae 100644
--- a/dashboards/jfr-dashboard-export-share-0.5.json
+++ b/dashboards/jfr-dashboard-export-share-0.5.json
@@ -1976,7 +1976,7 @@
           "measurement": "big-allocations",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT \"stacktrace\",\"objectClass\" FROM \"default\".\"big-allocations\" WHERE $timeFilter",
+          "query": "SELECT \"stacktrace\",\"objectClass\" FROM \"big-allocations\" WHERE (\"service\"::tag =~ /^$service$/ AND \"testEnvironment\"::tag =~ /^$test_environment$/ AND \"systemUnderTest\"::tag =~ /^$system_under_test$/) AND $timeFilter",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -2719,7 +2719,7 @@
           "measurement": "java-monitor-enter",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT \"stacktrace\",\"monitor-class\",\"thread\",\"previous-owner\",\"address\" FROM \"default\".\"java-monitor-enter\" WHERE $timeFilter",
+          "query": "SELECT \"stacktrace\",\"monitor-class\",\"thread\",\"previous-owner\",\"address\" FROM \"java-monitor-enter\" WHERE (\"service\"::tag =~ /^$service$/ AND \"testEnvironment\"::tag =~ /^$test_environment$/ AND \"systemUnderTest\"::tag =~ /^$system_under_test$/) AND $timeFilter",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -3102,7 +3102,7 @@
           "measurement": "java-monitor-wait",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT \"stacktrace\",\"monitor-class\",\"thread\",\"notifier\",\"timeout\",\"timed-out\" FROM \"default\".\"java-monitor-wait\" WHERE $timeFilter",
+          "query": "SELECT \"stacktrace\",\"monitor-class\",\"thread\",\"notifier\",\"timeout\",\"timed-out\" FROM \"java-monitor-wait\" WHERE (\"service\"::tag =~ /^$service$/ AND \"testEnvironment\"::tag =~ /^$test_environment$/ AND \"systemUnderTest\"::tag =~ /^$system_under_test$/) AND $timeFilter",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -5103,7 +5103,7 @@
   "timepicker": {},
   "timezone": "",
   "title": "Perfana JFR Metrics 0.5",
-  "uid": "perfana-jfr-metrics-0-5",
-  "version": 21,
+  "uid": "perfana-jfr-metrics-0-5-1",
+  "version": 22,
   "weekStart": ""
 }
\ No newline at end of file