diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts
index 60c5828d..d7ab4b0d 100644
--- a/src/lib/ae_events/ae_events__event.ts
+++ b/src/lib/ae_events/ae_events__event.ts
@@ -449,16 +449,29 @@ export async function qry_ae_obj_li__event({
         search_query.q = qry_str;
     }
 
+<<<<<<< HEAD
     // Use raw field name to bypass backend mapping conflicts (Integer Trap)
     if (for_obj_id) {
         search_query.and.push({ field: 'account_id_random', op: 'eq', value: for_obj_id });
     }
+=======
+    // Use raw field name to bypass backend mapping conflicts
+    // if (for_obj_id) {
+    //     search_query.and.push({ field: 'account_id_random', op: 'eq', value: for_obj_id });
+    // }
+>>>>>>> 63c633f5 (Fix(Events): Revert to URL-based account context for V3 Search)
 
     const result_li = await api.search_ae_obj_v3({
         api_cfg,
         obj_type: 'event',
+<<<<<<< HEAD
         // Inject header context for Auth but keep body context for Filtering
         headers: { 'x-account-id': for_obj_id },
+=======
+        for_obj_type,
+        for_obj_id,
+        // Pass account context via search query body instead of query params to avoid duplicate mapping
+>>>>>>> 63c633f5 (Fix(Events): Revert to URL-based account context for V3 Search)
         search_query,
         enabled,
         hidden,