diff --git a/enrich.py b/enrich.py
index 4c28a37..b5d70e3 100755
--- a/enrich.py
+++ b/enrich.py
@@ -354,7 +354,7 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
                 try:
                     mgt = packet.get_multiple_layers('wlan.mgt')[0]
                     if hasattr(mgt, 'get_field'):
-                        tags = mgt.get_field('tag')
+                        tags = mgt._all_fields.get('wlan.tagged.all', {}).get('wlan.tag', [])
                         if not tags:
                             print("[DEBUG] wlan.mgt present, but no tags parsed.")
 
@@ -456,7 +456,7 @@ def main():
                 'AvgAPSignal': avg_signal,
                 'StrongestAPSignal': strongest_signal,
                 'UnlinkedDevices': unlinked,
-                'CiscoReportedClients': cisco_avg_reported_clients,
+                'CiscoAvgReportedClients': cisco_avg_reported_clients,
                 'CiscoMaxReportedClients': cisco_max_reported_clients
             })