diff --git a/v1.6.3/unifi-poller-client-insights-influxdb_rev4.json b/v1.6.3/unifi-poller-client-insights-influxdb_rev4.json
index 31193c1..2175823 100644
--- a/v1.6.3/unifi-poller-client-insights-influxdb_rev4.json
+++ b/v1.6.3/unifi-poller-client-insights-influxdb_rev4.json
@@ -179,7 +179,7 @@
           "measurement": "clients",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT last(\"ip\") AS \"Address\", last(\"note\") AS \"Note\", last(\"network\") AS \"Network\" FROM \"clients\" WHERE (\"is_wired\" = 'false' AND \"ap_mac\" =~ /^$AP$/) AND $timeFilter GROUP BY \"mac\", \"oui\", \"channel\", \"radio\", \"name\", \"ap_mac\"",
+          "query": "SELECT last(\"ip\") AS \"Address\", last(\"note\") AS \"Note\", last(\"network\") AS \"Network\" FROM \"clients\" WHERE (\"is_wired\" = 'false' AND \"ap_mac\" =~ /^$AP$/) AND $timeFilter GROUP BY \"mac\", \"oui\", \"channel_name\", \"radio\", \"name\", \"ap_mac\"",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "table",
@@ -611,7 +611,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -645,7 +645,7 @@
           "tags": []
         },
         {
-          "alias": "Channel $tag_channel",
+          "alias": "Channel $tag_channel_name",
           "groupBy": [
             {
               "params": [
@@ -663,7 +663,7 @@
           "hide": false,
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE time > now() - 10m AND (\"site_name\" =~ /$Site$/ AND \"ap_name\" =~ /^$AP$/ AND \"name\" =~ /^$Client$/) GROUP BY \"channel\"",
+          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE time > now() - 10m AND (\"site_name\" =~ /$Site$/ AND \"ap_name\" =~ /^$AP$/ AND \"name\" =~ /^$Client$/) GROUP BY \"channel_name\"",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -732,7 +732,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -814,7 +814,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -853,7 +853,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -934,7 +934,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -3995,4 +3995,4 @@
   "title": "UniFi-Poller: Client Insights - InfluxDB",
   "uid": "YVR23BZiz",
   "version": 102
-}
\ No newline at end of file
+}
diff --git a/v1.6.3/unifi-poller-network-sites-influxdb_rev3.json b/v1.6.3/unifi-poller-network-sites-influxdb_rev3.json
index 39ec61e..4e2aa76 100644
--- a/v1.6.3/unifi-poller-network-sites-influxdb_rev3.json
+++ b/v1.6.3/unifi-poller-network-sites-influxdb_rev3.json
@@ -3135,4 +3135,4 @@
   "title": "UniFi-Poller: Network Sites - InfluxDB",
   "uid": "5_omrT7Zz",
   "version": 45
-}
\ No newline at end of file
+}
diff --git a/v1.6.3/unifi-poller-uap-insights-influxdb_rev4.json b/v1.6.3/unifi-poller-uap-insights-influxdb_rev4.json
index 86aeaef..9e3a024 100644
--- a/v1.6.3/unifi-poller-uap-insights-influxdb_rev4.json
+++ b/v1.6.3/unifi-poller-uap-insights-influxdb_rev4.json
@@ -151,7 +151,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -230,7 +230,7 @@
       "strokeWidth": 1,
       "targets": [
         {
-          "alias": "Chan $tag_channel",
+          "alias": "Chan $tag_channel_name",
           "groupBy": [
             {
               "params": [
@@ -248,7 +248,7 @@
           "measurement": "uap",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE $timeFilter AND ap_name =~ /$AP$/ AND site_name =~ /$Site$/ GROUP BY \"channel\"",
+          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE $timeFilter AND ap_name =~ /$AP$/ AND site_name =~ /$Site$/ GROUP BY \"channel_name\"",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -316,7 +316,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -443,7 +443,7 @@
             [
               {
                 "params": [
-                  "channel"
+                  "channel_num"
                 ],
                 "type": "field"
               }
@@ -1069,7 +1069,7 @@
             [
               {
                 "params": [
-                  "channel"
+                  "channel_num"
                 ],
                 "type": "field"
               },
@@ -4683,4 +4683,4 @@
   "title": "UniFi-Poller: UAP Insights - InfluxDB",
   "uid": "8nQ_RPZiz",
   "version": 79
-}
\ No newline at end of file
+}
diff --git a/v1.6.3/unifi-poller-usg-insights-influxdb_rev5.json b/v1.6.3/unifi-poller-usg-insights-influxdb_rev5.json
index 2c2c166..faed407 100644
--- a/v1.6.3/unifi-poller-usg-insights-influxdb_rev5.json
+++ b/v1.6.3/unifi-poller-usg-insights-influxdb_rev5.json
@@ -3799,4 +3799,4 @@
   "title": "UniFi-Poller: USG Insights - InfluxDB",
   "uid": "WX6RJOMik",
   "version": 63
-}
\ No newline at end of file
+}
diff --git a/v1.6.3/unifi-poller-usw-insights-influxdb_rev4.json b/v1.6.3/unifi-poller-usw-insights-influxdb_rev4.json
index 72faf0d..c99d988 100644
--- a/v1.6.3/unifi-poller-usw-insights-influxdb_rev4.json
+++ b/v1.6.3/unifi-poller-usw-insights-influxdb_rev4.json
@@ -3329,4 +3329,4 @@
   "title": "UniFi-Poller: USW Insights - InfluxDB",
   "uid": "HIKZ98GZz",
   "version": 104
-}
\ No newline at end of file
+}
diff --git a/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json b/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json
index 8493026..9a240b2 100644
--- a/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json	
+++ b/v2.0.0/UniFi-Poller_ Client Insights - InfluxDB.json	
@@ -229,7 +229,7 @@
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "decimals": 2,
           "mappingType": 1,
-          "pattern": "channel",
+          "pattern": "channel_name",
           "thresholds": [],
           "type": "string",
           "unit": "short"
@@ -326,7 +326,7 @@
             },
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             },
@@ -364,7 +364,7 @@
           "measurement": "clients",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT last(\"ip\") AS \"Address\", last(\"note\") AS \"Note\", last(\"network\") AS \"Network\" FROM \"clients\" WHERE (\"is_wired\" = 'false' AND \"ap_mac\" =~ /^${AP:regex}$/) AND $timeFilter GROUP BY \"mac\", \"oui\", \"channel\", \"radio\", \"name\", \"ap_mac\"",
+          "query": "SELECT last(\"ip\") AS \"Address\", last(\"note\") AS \"Note\", last(\"network\") AS \"Network\" FROM \"clients\" WHERE (\"is_wired\" = 'false' AND \"ap_mac\" =~ /^${AP:regex}$/) AND $timeFilter GROUP BY \"mac\", \"oui\", \"channel_name\", \"radio\", \"name\", \"ap_mac\"",
           "rawQuery": false,
           "refId": "A",
           "resultFormat": "table",
@@ -846,7 +846,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -880,7 +880,7 @@
           "tags": []
         },
         {
-          "alias": "Channel $tag_channel",
+          "alias": "Channel $tag_channel_name",
           "groupBy": [
             {
               "params": [
@@ -898,7 +898,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:regex}$/ ) 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_name\"",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -972,7 +972,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -1060,7 +1060,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -1146,7 +1146,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
diff --git a/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json b/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json
index 403f164..8af4cef 100644
--- a/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json	
+++ b/v2.0.0/UniFi-Poller_ UAP Insights - InfluxDB.json	
@@ -168,7 +168,7 @@
       "strokeWidth": 1,
       "targets": [
         {
-          "alias": "Ch $tag_channel",
+          "alias": "Ch $tag_channel_name",
           "groupBy": [
             {
               "params": [
@@ -186,7 +186,7 @@
           "measurement": "uap",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE $timeFilter AND ap_name =~ /^${AP:regex}$/ AND site_name =~ /^${Site:regex}$/ GROUP BY \"channel\"",
+          "query": "select count(distinct(hostname)) FROM \"clients\" WHERE $timeFilter AND ap_name =~ /^${AP:regex}$/ AND site_name =~ /^${Site:regex}$/ GROUP BY \"channel_name\"",
           "rawQuery": true,
           "refId": "B",
           "resultFormat": "time_series",
@@ -256,7 +256,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -340,7 +340,7 @@
           "groupBy": [
             {
               "params": [
-                "channel"
+                "channel_name"
               ],
               "type": "tag"
             }
@@ -468,7 +468,7 @@
             [
               {
                 "params": [
-                  "channel"
+                  "channel_num"
                 ],
                 "type": "field"
               }