diff --git a/src/controllers/customer-branch-controller.ts b/src/controllers/customer-branch-controller.ts
index 39e0848..ae5c350 100644
--- a/src/controllers/customer-branch-controller.ts
+++ b/src/controllers/customer-branch-controller.ts
@@ -122,6 +122,19 @@ export class CustomerBranchController extends Controller {
         { name: { contains: query }, zipCode },
         { email: { contains: query }, zipCode },
         { code: { contains: query }, zipCode },
+        { address: { contains: query }, zipCode },
+        { addressEN: { contains: query }, zipCode },
+        { province: { name: { contains: query } }, zipCode },
+        { province: { nameEN: { contains: query } }, zipCode },
+        { district: { name: { contains: query } }, zipCode },
+        { district: { nameEN: { contains: query } }, zipCode },
+        { subDistrict: { name: { contains: query } }, zipCode },
+        { subDistrict: { nameEN: { contains: query } }, zipCode },
+        {
+          customer: {
+            OR: [{ customerName: { contains: query } }, { customerNameEN: { contains: query } }],
+          },
+        },
       ],
       AND: { customerId },
     } satisfies Prisma.CustomerBranchWhereInput;