diff --git a/api_events/events/address/address.py b/api_events/events/address/address.py
index a0806c1..36fcd14 100644
--- a/api_events/events/address/address.py
+++ b/api_events/events/address/address.py
@@ -47,7 +47,6 @@ class AddressListEventMethods(MethodToEvent):
                 status_code=404,
                 detail="User has no post code registered. User can not list addresses.",
             )
-
         get_street_ids = [
             street_id[0]
             for street_id in AddressPostcode.select_only(
@@ -62,14 +61,12 @@ class AddressListEventMethods(MethodToEvent):
                 status_code=404,
                 detail="User has no street registered. User can not list addresses.",
             )
-
         Addresses.pre_query = Addresses.filter_all(
             Addresses.street_id.in_(get_street_ids),
             *Addresses.valid_record_args(Addresses),
         ).query
         Addresses.filter_attr = list_options
         records = Addresses.filter_all(
-            *Addresses.get_smart_query(list_options.query),
             *Addresses.valid_record_args(Addresses),
         ).data
         return AlchemyJsonResponse(
@@ -87,7 +84,6 @@ class AddressListEventMethods(MethodToEvent):
         Addresses.filter_attr = list_options
         records = Addresses.list_via_employee(
             token_dict=token_dict,
-            filter_expr=Addresses.get_smart_query(list_options.query),
         )
         return AlchemyJsonResponse(
             completed=True,
@@ -419,8 +415,7 @@ class AddressPostCodeListEventMethods(MethodToEvent):
         ).query
         AddressPostcode.filter_attr = list_options
         records = AddressPostcode.filter_all(
-            *Addresses.get_smart_query(list_options.query),
-            *Addresses.valid_record_args(AddressPostcode),
+            *AddressPostcode.valid_record_args(AddressPostcode),
         ).data
         return AlchemyJsonResponse(
             completed=True,
diff --git a/api_events/events/building/building_build.py b/api_events/events/building/building_build.py
index 15690cd..64a27c6 100644
--- a/api_events/events/building/building_build.py
+++ b/api_events/events/building/building_build.py
@@ -49,7 +49,6 @@ class BuildListEventMethods(MethodToEvent):
             )
         Build.filter_attr = list_options
         records = Build.filter_all(
-            *Build.get_smart_query(smart_query=list_options.query),
             *Build.valid_record_args(Build),
         ).data
         return AlchemyJsonResponse(
diff --git a/api_events/events/building/building_build_area.py b/api_events/events/building/building_build_area.py
index ad8b715..30ab7d6 100644
--- a/api_events/events/building/building_build_area.py
+++ b/api_events/events/building/building_build_area.py
@@ -51,7 +51,6 @@ class BuildAreaListEventMethods(MethodToEvent):
             ).query
         BuildArea.filter_attr = list_options
         records = BuildArea.filter_all(
-            *BuildArea.get_smart_query(smart_query=list_options.query),
             *BuildArea.valid_record_args(BuildArea),
         )
         return AlchemyJsonResponse(
diff --git a/api_events/events/building/building_build_parts.py b/api_events/events/building/building_build_parts.py
index 21fe496..3329aa6 100644
--- a/api_events/events/building/building_build_parts.py
+++ b/api_events/events/building/building_build_parts.py
@@ -38,8 +38,8 @@ class BuildingBuildPartsListEventMethods(MethodToEvent):
             BuildParts.build_id.in_(build_list_ids),
             *BuildParts.valid_record_args(BuildParts),
         ).query
-        records = BuildParts.filter_active(
-            *BuildParts.get_smart_query(list_options.query),
+        BuildParts.filter_attr = list_options
+        records = BuildParts.filter_all(
             *BuildParts.valid_record_args(BuildParts),
         )
         return AlchemyJsonResponse(
diff --git a/api_events/events/building/building_build_sites.py b/api_events/events/building/building_build_sites.py
index fc5371a..aadf22c 100644
--- a/api_events/events/building/building_build_sites.py
+++ b/api_events/events/building/building_build_sites.py
@@ -50,7 +50,6 @@ class BuildSitesListEventMethods(MethodToEvent):
             ).query
         BuildSites.filter_attr = list_options
         records = BuildSites.filter_all(
-            *BuildSites.get_smart_query(smart_query=list_options.query),
             *BuildSites.valid_record_args(BuildSites),
         )
         return AlchemyJsonResponse(
diff --git a/api_events/events/building/building_living_spaces.py b/api_events/events/building/building_living_spaces.py
index ab84f1b..e1888d1 100644
--- a/api_events/events/building/building_living_spaces.py
+++ b/api_events/events/building/building_living_spaces.py
@@ -64,7 +64,6 @@ class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
             ).query
             BuildLivingSpace.filter_attr = list_options
             records = BuildLivingSpace.filter_all(
-                *BuildLivingSpace.get_smart_query(smart_query=list_options.query),
                 *BuildLivingSpace.valid_record_args(BuildLivingSpace),
             )
         elif isinstance(token_dict, EmployeeTokenObject):
@@ -97,9 +96,8 @@ class BuildingLivingSpacesPartsListEventMethods(MethodToEvent):
                 ),
                 *BuildLivingSpace.valid_record_args(BuildLivingSpace),
             ).query
-            Build.filter_attr = list_options
+            BuildLivingSpace.filter_attr = list_options
             records = BuildLivingSpace.filter_all(
-                *BuildLivingSpace.get_smart_query(smart_query=list_options.query),
                 *BuildLivingSpace.valid_record_args(BuildLivingSpace),
             )
         return AlchemyJsonResponse(
diff --git a/api_events/events/company/company_company.py b/api_events/events/company/company_company.py
index efc4971..0ab93f6 100644
--- a/api_events/events/company/company_company.py
+++ b/api_events/events/company/company_company.py
@@ -43,7 +43,7 @@ class CompanyListEventMethods(MethodToEvent):
             ).query
         Companies.filter_attr = list_options
         records = Companies.filter_active(
-            *Companies.get_smart_query(list_options.query)
+            *Companies.valid_record_args(Companies)
         )
         return AlchemyJsonResponse(
             completed=True,
diff --git a/api_events/events/company/company_department.py b/api_events/events/company/company_department.py
index 7db05dc..4c349a5 100644
--- a/api_events/events/company/company_department.py
+++ b/api_events/events/company/company_department.py
@@ -31,7 +31,6 @@ class DepartmentListEventMethods(MethodToEvent):
     ):
         Departments.filter_attr = list_options
         records = Departments.filter_active(
-            *Departments.get_smart_query(smart_query=list_options.query),
             Departments.company_id == token_dict.selected_company.company_id,
         )
         return AlchemyJsonResponse(
diff --git a/api_events/events/company/company_duties.py b/api_events/events/company/company_duties.py
index e771919..cbca482 100644
--- a/api_events/events/company/company_duties.py
+++ b/api_events/events/company/company_duties.py
@@ -30,7 +30,6 @@ class DutiesListEventMethods(MethodToEvent):
     ):
         Duties.filter_attr = list_options
         records = Duties.filter_all(
-            *Duties.get_smart_query(smart_query=list_options.query),
             Duties.company_id == token_dict.selected_company.company_id,
         )
         return {
diff --git a/api_events/events/company/company_duty.py b/api_events/events/company/company_duty.py
index 650e168..eaa5d3e 100644
--- a/api_events/events/company/company_duty.py
+++ b/api_events/events/company/company_duty.py
@@ -27,8 +27,9 @@ class DutyListEventMethods(MethodToEvent):
         list_options: ListOptions,
         token_dict: EmployeeTokenObject,
     ):
+        Duty.filter_attr = list_options
         records = Duty.filter_active(
-            *Duty.get_smart_query(list_options.query),
+            *Duty.valid_record_args(Duty)
         )
         return AlchemyJsonResponse(
             completed=True,
diff --git a/api_events/events/company/company_employee.py b/api_events/events/company/company_employee.py
index 770faf5..451e736 100644
--- a/api_events/events/company/company_employee.py
+++ b/api_events/events/company/company_employee.py
@@ -31,7 +31,6 @@ class EmployeeListEventMethods(MethodToEvent):
     ):
         Employees.filter_attr = list_options
         records = Employees.filter_active(
-            *Employees.get_smart_query(smart_query=list_options.query),
             Employees.company_id == token_dict.selected_company.company_id,
         )
         return AlchemyJsonResponse(
diff --git a/api_events/events/company/company_staff.py b/api_events/events/company/company_staff.py
index 740ecc2..583a612 100644
--- a/api_events/events/company/company_staff.py
+++ b/api_events/events/company/company_staff.py
@@ -26,7 +26,7 @@ class StaffListEventMethods(MethodToEvent):
     def staff_list(cls, list_options: ListOptions, token_dict: EmployeeTokenObject):
         Staff.filter_attr = list_options
         records = Staff.filter_active(
-            *Staff.get_smart_query(smart_query=list_options.query),
+            *Staff.valid_record_args(Staff)
         )
         return AlchemyJsonResponse(
             completed=True,
diff --git a/api_events/events/decision_book/decision_book_decision_book.py b/api_events/events/decision_book/decision_book_decision_book.py
index 098b774..1626bfa 100644
--- a/api_events/events/decision_book/decision_book_decision_book.py
+++ b/api_events/events/decision_book/decision_book_decision_book.py
@@ -46,15 +46,15 @@ class DecisionBookListEventMethods(MethodToEvent):
                     status_code=status.HTTP_404_NOT_FOUND,
                     detail=f"No building is match with given Employee UUID {token_dict.selected_company.employee_uu_id}",
                 )
+            BuildDecisionBook.filter_attr = list_options
             records = BuildDecisionBook.filter_all(
                 BuildDecisionBook.build_id.in_([build.id for build in build_id_list]),
-                *BuildDecisionBook.get_smart_query(list_options.query),
                 *BuildDecisionBook.valid_record_args(BuildDecisionBook),
             ).data
         elif isinstance(token_dict, OccupantTokenObject):
+            BuildDecisionBook.filter_attr = list_options
             records = BuildDecisionBook.filter_all(
                 BuildDecisionBook.build_id == token_dict.selected_occupant.build_id,
-                *BuildDecisionBook.get_smart_query(list_options.query),
                 *BuildDecisionBook.valid_record_args(BuildDecisionBook),
             ).data
         return AlchemyJsonResponse(
diff --git a/api_events/events/decision_book/decision_book_decision_book_items.py b/api_events/events/decision_book/decision_book_decision_book_items.py
index 5dca7ff..bfed4e8 100644
--- a/api_events/events/decision_book/decision_book_decision_book_items.py
+++ b/api_events/events/decision_book/decision_book_decision_book_items.py
@@ -27,6 +27,7 @@ from api_validations.validations_request import (
     InsertBuildDecisionBookItems,
     ListDecisionBook,
 )
+from service_app_test.test_application.evyos.datas.company_employee_data import list_options
 
 
 class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
@@ -103,8 +104,9 @@ class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
             # BuildDecisionBookItems.pre_query = BuildDecisionBookItems.select_action(
             #     occupant_id=token_dict.occupant_list["occupant_id"]
             # )
+            # BuildDecisionBookItems.filter_attr = list_options
             # records = BuildDecisionBookItems.filter_active(
-            #     *BuildDecisionBookItems.get_smart_query(list_options.query)
+            #     *BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
             # )
             # return return_json_response_from_alchemy(response=records, pagination=list_options)
             return
diff --git a/api_events/events/events/events_events.py b/api_events/events/events/events_events.py
index 58e68df..096cbd7 100644
--- a/api_events/events/events/events_events.py
+++ b/api_events/events/events/events_events.py
@@ -37,9 +37,8 @@ class EventsListEventMethods(MethodToEvent):
         token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         Events.filter_attr = list_options
-        records = Events.filter_active(
-            *Events.get_smart_query(list_options.query),
-            Events.active == True,
+        records = Events.filter_all(
+            *Events.valid_record_args(Events)
         )
         return AlchemyJsonResponse(
             completed=True,
diff --git a/api_events/events/identity/people.py b/api_events/events/identity/people.py
index 4545839..5871e21 100644
--- a/api_events/events/identity/people.py
+++ b/api_events/events/identity/people.py
@@ -38,8 +38,8 @@ class PeopleListEventMethods(MethodToEvent):
                     token_dict.selected_company.bulk_duties_id,
                 ],
             )
+            People.filter_attr = list_options
             records = People.filter_all(
-                *People.get_smart_query(smart_query=list_options.query),
                 *People.valid_record_args(People),
             ).data
         elif isinstance(token_dict, OccupantTokenObject):
@@ -51,8 +51,8 @@ class PeopleListEventMethods(MethodToEvent):
                 People.id.in_([user.person_id for user in related_users]),
                 *People.valid_record_args(People),
             ).query
+            People.filter_attr = list_options
             records = People.filter_all(
-                *People.get_smart_query(smart_query=list_options.query),
                 *People.valid_record_args(People),
             ).data
         return AlchemyJsonResponse(
@@ -67,8 +67,8 @@ class PeopleListEventMethods(MethodToEvent):
         list_options,
         token_dict: EmployeeTokenObject,
     ):
+        People.filter_attr = list_options
         records = People.filter_all(
-            *People.get_smart_query(smart_query=list_options.query),
             *People.valid_record_args(People),
         ).data
         return AlchemyJsonResponse(
@@ -84,8 +84,8 @@ class PeopleListEventMethods(MethodToEvent):
         token_dict: EmployeeTokenObject,
     ):
         if isinstance(token_dict, EmployeeTokenObject):
+            People.filter_attr = list_options
             records = People.filter_all(
-                *People.get_smart_query(smart_query=list_options.query),
                 *People.valid_record_args(People),
             ).data
         return AlchemyJsonResponse(
diff --git a/api_events/events/identity/users.py b/api_events/events/identity/users.py
index 60f75ef..f658619 100644
--- a/api_events/events/identity/users.py
+++ b/api_events/events/identity/users.py
@@ -58,7 +58,6 @@ class UserListEventMethods(MethodToEvent):
             )
         Users.filter_attr = list_options
         records = Users.filter_all(
-            *Users.get_smart_query(list_options.query),
             *Users.valid_record_args(Users),
         ).data
         return AlchemyJsonResponse(