diff --git a/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json b/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json
index 096b669..828b49f 100644
--- a/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json	
+++ b/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json	
@@ -904,7 +904,7 @@
           "hide": false,
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE time > now() - 5m AND (\"site_name\" =~ /^${Site:regex}$/ AND \"name\" =~ /^${Wireless:regex}$/ AND ap_name =~ /$AP$/ ) GROUP BY \"channel\"",
+          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE time > now() - 5m AND (\"site_name\" =~ /^${Site:regex}$/ AND \"name\" =~ /^${Wireless:regex}$/ AND ap_name =~ /^${AP:regex}$/ ) GROUP BY \"channel\"",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -986,7 +986,7 @@
           "measurement": "clients",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT count(distinct(\"hostname\")) FROM \"clients\" WHERE  $timeFilter  AND \"ap_name\" =~ /$AP$/ AND \"site_name\" =~ /^${Site:regex}$/  AND \"name\" =~ /^${Wireless:regex}$/ GROUP BY radio_proto",
+          "query": "SELECT count(distinct(\"hostname\")) FROM \"clients\" WHERE  $timeFilter  AND \"ap_name\" =~ /^${AP:regex}$/ AND \"site_name\" =~ /^${Site:regex}$/  AND \"name\" =~ /^${Wireless:regex}$/ GROUP BY radio_proto",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series",