diff --git a/src/modules/minglaradmin/services/minglar.service.ts b/src/modules/minglaradmin/services/minglar.service.ts
index 973f12e..6608294 100644
--- a/src/modules/minglaradmin/services/minglar.service.ts
+++ b/src/modules/minglaradmin/services/minglar.service.ts
@@ -748,21 +748,60 @@ export class MinglarService {
     };
 
     /** SEARCH FILTER **/
+    // if (search?.trim()) {
+    //   const term = search.trim();
+
+    //   if (/^\d+$/.test(term)) {
+    //     filters.id = Number(term);
+    //   } else {
+    //     filters.user = {
+    //       ...filters.user,
+    //       OR: [
+    //         { emailAddress: { contains: term, mode: 'insensitive' } },
+    //         { firstName: { contains: term, mode: 'insensitive' } },
+    //         { lastName: { contains: term, mode: 'insensitive' } },
+    //       ],
+    //     };
+    //   }
+    // }
     if (search?.trim()) {
       const term = search.trim();
-
-      if (/^\d+$/.test(term)) {
-        filters.id = Number(term);
-      } else {
-        filters.user = {
-          ...filters.user,
+      filters.AND = [
+        {
           OR: [
-            { emailAddress: { contains: term, mode: 'insensitive' } },
-            { firstName: { contains: term, mode: 'insensitive' } },
-            { lastName: { contains: term, mode: 'insensitive' } },
+            {
+              companyName: {
+                contains: term,
+                mode: 'insensitive',
+              },
+            },
+            {
+              user: {
+                OR: [
+                  {
+                    firstName: {
+                      contains: term,
+                      mode: 'insensitive',
+                    },
+                  },
+                  {
+                    lastName: {
+                      contains: term,
+                      mode: 'insensitive',
+                    },
+                  },
+                  {
+                    userRefNumber: {
+                      contains: term,
+                      mode: 'insensitive',
+                    },
+                  },
+                ],
+              },
+            },
           ],
-        };
-      }
+        },
+      ];
     }
 
     /** USER STATUS FILTER **/