diff --git a/enrichment/indexed_capture.py b/enrichment/indexed_capture.py
index 41025d9..3104f19 100644
--- a/enrichment/indexed_capture.py
+++ b/enrichment/indexed_capture.py
@@ -162,21 +162,26 @@ class IndexedCapture:
                 else:
                     continue
 
-                # Track APs (beacons / probe responses only!)
+                # Determine subtype
                 subtype = int(getattr(wlan, 'type_subtype', '0'), 16)
+                
+                # Always debug if resolved channel == AP's channel
+                if channel == ap_channel:
+                    print(f"[DEBUG] Packet: subtype={subtype}, bssid={bssid}, sa={sa}, da={da}")
+                
+                # Track APs (beacons / probe responses only)
                 if subtype in (5, 8) and bssid:
                     window_aps[channel].add(bssid)
-
                     if channel == ap_channel:
-                        print(f"[DEBUG] Adding bssid={bssid} to window_aps[{channel}]")
-
-                # Track clients
+                        print(f"[DEBUG] [AP] Adding bssid={bssid} to window_aps[{channel}]")
+                
+                # Track clients (always)
                 for mac in (sa, da):
                     if mac and mac != 'ff:ff:ff:ff:ff:ff':
                         window_clients[channel].add(mac)
-
                         if channel == ap_channel:
-                            print(f"[DEBUG] Adding mac={mac} to window_clients[{channel}]")
+                            print(f"[DEBUG] [CLIENT] Adding mac={mac} to window_clients[{channel}]")
+
 
                 # Track signals
                 signal = getattr(radio, 'dbm_antsignal', None)