diff --git a/src/components/FormElements/select.tsx b/src/components/FormElements/select.tsx
index 22f482f..f3a3ddc 100644
--- a/src/components/FormElements/select.tsx
+++ b/src/components/FormElements/select.tsx
@@ -22,6 +22,8 @@ type PropsType<T extends FieldValues> = {
   register?: UseFormRegister<T>;
   errors?: FieldErrors<T>;
   required?: boolean;
+  clearable?: boolean;
+  onClear?: () => void;
 } & (
   | { placeholder?: string; defaultValue: string }
   | { placeholder: string; defaultValue?: string }
@@ -42,13 +44,22 @@ export function Select<T extends FieldValues>({
   onChange,
   onBlur,
   ref,
+  clearable = false,
+  onClear,
   ...props
 }: PropsType<T>) {
   const id = useId();
 
   const [isOptionSelected, setIsOptionSelected] = useState(!!defaultValue);
+  const [value, setValue] = useState(defaultValue || "");
   const error = errors && errors[name];
 
+  const handleClear = () => {
+    setValue("");
+    setIsOptionSelected(false);
+    onClear?.();
+  };
+
   return (
     <div className={cn("space-y-3", className)}>
       <label
@@ -70,8 +81,9 @@ export function Select<T extends FieldValues>({
           id={id}
           name={name}
           ref={ref}
-          defaultValue={defaultValue || ""}
+          value={value}
           onChange={(e) => {
+            setValue(e.target.value);
             setIsOptionSelected(!!e.target.value);
             onChange?.(e);
           }}
@@ -81,6 +93,7 @@ export function Select<T extends FieldValues>({
             isOptionSelected && "text-dark dark:text-white",
             error && "border-red focus:border-red dark:border-red",
             prefixIcon && "pl-11.5",
+            clearable && value && "pr-20",
           )}
         >
           {placeholder && (
@@ -96,6 +109,30 @@ export function Select<T extends FieldValues>({
           ))}
         </select>
 
+        {clearable && value && (
+          <button
+            type="button"
+            onClick={handleClear}
+            className="absolute right-10 top-1/2 -translate-y-1/2 text-dark-5 hover:text-dark dark:text-dark-6 dark:hover:text-white"
+          >
+            <svg
+              width="16"
+              height="16"
+              viewBox="0 0 16 16"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M12 4L4 12M4 4L12 12"
+                stroke="currentColor"
+                strokeWidth="2"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+              />
+            </svg>
+          </button>
+        )}
+
         <ChevronUpIcon className="pointer-events-none absolute right-4 top-1/2 -translate-y-1/2 rotate-180" />
       </div>
 
diff --git a/src/components/Tables/admins/AdminListFilters.tsx b/src/components/Tables/admins/AdminListFilters.tsx
index edd3f84..c871356 100644
--- a/src/components/Tables/admins/AdminListFilters.tsx
+++ b/src/components/Tables/admins/AdminListFilters.tsx
@@ -1,57 +1,95 @@
 import InputGroup from "@/components/FormElements/InputGroup";
 import { Select } from "@/components/FormElements/select";
-import { AdminRoles, NotificationChannels } from "@/constants/enums";
+import { AdminRoles, AdminStatus } from "@/constants/enums";
 import { getEnumAsArray } from "@/utils/shared";
-import useAdminListFilterPresenter from "./useAdminListFilterPresenter";
+import {
+  FieldValues,
+  UseFormHandleSubmit,
+  UseFormRegister,
+} from "react-hook-form";
 
-interface IProps {}
+interface AdminListFiltersProps {
+  filterRegister: UseFormRegister<FieldValues>;
+  setIsFilterModalOpen: (isOpen: boolean) => void;
+  isMutating: number;
+  handleFilterSubmit: UseFormHandleSubmit<FieldValues>;
+  search: (data: any) => void;
+}
 
-const AdminListFilters = ({}: IProps) => {
-  const { register } = useAdminListFilterPresenter();
+const AdminListFilters = ({
+  filterRegister,
+  setIsFilterModalOpen,
+  isMutating,
+  handleFilterSubmit,
+  search,
+}: AdminListFiltersProps) => {
   return (
-    <form className="grid !min-w-full grid-cols-3 gap-4">
+    <form
+      className="grid !min-w-full grid-cols-3 gap-4"
+      onSubmit={handleFilterSubmit(search)}
+    >
       <Select
-        {...register("method")}
-        items={getEnumAsArray(NotificationChannels)}
-        label="Method"
-        name="method"
-        placeholder="Method"
-      />
-      <Select
-        {...register("status")}
-        items={getEnumAsArray(NotificationChannels)}
+        {...filterRegister("status")}
+        items={getEnumAsArray(AdminStatus)}
         label="status"
         name="status"
         placeholder="Status"
+        clearable
       />
       <InputGroup
-        {...register("email")}
+        {...filterRegister("search")}
+        name="search"
+        label="search"
+        placeholder="search"
+        type="search"
+      />
+      {/* <InputGroup
+        {...filterRegister("email")}
         name="email"
         label="email"
         placeholder="email"
         type="email"
-      />
+      /> */}
       <Select
-        {...register("role")}
+        {...filterRegister("role")}
         name="role"
         items={getEnumAsArray(AdminRoles)}
         label="Role"
         placeholder="Role"
       />
-      <InputGroup
-        {...register("username")}
+      {/* <InputGroup
+        {...filterRegister("username")}
         label="username"
         name="username"
         placeholder="username"
         type="text"
-      />
-      <InputGroup
-        {...register("full_name")}
+      /> */}
+      {/* <InputGroup
+        {...filterRegister("full_name")}
         label="full name"
         name="full_name"
         placeholder="full name"
         type="text"
-      />
+      /> */}
+      <div className="flex gap-4">
+        <button
+          type="submit"
+          className="mt-6 flex w-fit justify-center rounded-lg bg-primary p-[13px] font-medium capitalize text-white hover:bg-opacity-90"
+        >
+          {isMutating ? (
+            <div className="h-5 w-5 animate-spin rounded-full border-b-2 border-gray-1"></div>
+          ) : (
+            <span>Search</span>
+          )}
+        </button>
+        <button
+          type="button"
+          className="mt-6 flex w-fit justify-center rounded-lg bg-error p-[13px] font-medium capitalize text-white hover:bg-opacity-90"
+          onClick={() => setIsFilterModalOpen(false)}
+        >
+          Close
+        </button>
+      </div>
     </form>
   );
 };
diff --git a/src/components/Tables/admins/index.tsx b/src/components/Tables/admins/index.tsx
index 1735331..14b85e7 100644
--- a/src/components/Tables/admins/index.tsx
+++ b/src/components/Tables/admins/index.tsx
@@ -39,6 +39,10 @@ const AdminsTable = () => {
     currentUser,
     setStatus,
     status,
+    handleFilterSubmit,
+    search,
+    filterRegister,
+    isMutating,
   } = useAdminsPresenter();
 
   return (
@@ -59,79 +63,87 @@ const AdminsTable = () => {
         </TableHeader>
         {isPending && <TableSkeleton column={columns.length} />}
         <TableBody>
-          {allUsers.map((item, index) => {
-            return (
-              <TableRow
-                key={item.id}
-                className="odd:bg-gray-2 dark:odd:bg-gray-7"
-              >
-                <TableCell className="text-start" colSpan={100}>
-                  {index + 1}
-                </TableCell>
-                <TableCell className="text-start" colSpan={100}>
-                  {item.full_name}
-                </TableCell>
-                <TableCell className="text-start" colSpan={100}>
-                  {item.email}
-                </TableCell>
-                <TableCell className="text-start" colSpan={100}>
-                  {item.role}
-                </TableCell>
-                <TableCell className="text-start" colSpan={100}>
-                  {item.username}
-                </TableCell>
-                <TableCell className="text-start" colSpan={100}>
-                  <Status status={item.status ?? ""}>{item.status}</Status>
-                </TableCell>
+          {!allUsers.length ? (
+            <TableRow>
+              <TableCell>
+                <h2>No user</h2>
+              </TableCell>
+            </TableRow>
+          ) : (
+            allUsers.map((item, index) => {
+              return (
+                <TableRow
+                  key={item?.id || index}
+                  className="odd:bg-gray-2 dark:odd:bg-gray-7"
+                >
+                  <TableCell className="text-start" colSpan={100}>
+                    {index + 1}
+                  </TableCell>
+                  <TableCell className="text-start" colSpan={100}>
+                    {item?.full_name}
+                  </TableCell>
+                  <TableCell className="text-start" colSpan={100}>
+                    {item?.email}
+                  </TableCell>
+                  <TableCell className="text-start" colSpan={100}>
+                    {item?.role}
+                  </TableCell>
+                  <TableCell className="text-start" colSpan={100}>
+                    {item?.username}
+                  </TableCell>
+                  <TableCell className="text-start" colSpan={100}>
+                    <Status status={item?.status ?? ""}>{item?.status}</Status>
+                  </TableCell>
 
-                <TableCell className="text-start xl:pr-7.5">
-                  <div className="flex items-center justify-start gap-x-3.5">
-                    <button
-                      data-tooltip-id="delete"
-                      data-tooltip-content="Delete"
-                      data-tooltip-place="top"
-                      className="hover:text-red-500"
-                      onClick={() => {
-                        setCurrentUser(item);
-                        setIsModalOpen(true);
-                      }}
-                    >
-                      <Tooltip {..._TooltipDefaultParams({ id: "delete" })} />
-                      <span className="sr-only">Delete Admin </span>
-                      <TrashIcon />
-                    </button>
-                    <button
-                      data-tooltip-id="change-status"
-                      data-tooltip-content="Change status"
-                      data-tooltip-place="top"
-                      className="hover:text-yellow-dark"
-                      onClick={() => {
-                        setCurrentUser(item);
-                        setIsChangeStatusModalOpen(true);
-                      }}
-                    >
-                      <Tooltip
-                        {..._TooltipDefaultParams({ id: "change-status" })}
-                      />
-                      <span className="sr-only">Change Admin Status</span>
-                      <UserSettingIcon />
-                    </button>
-                    <button
-                      data-tooltip-id="edit"
-                      data-tooltip-content="Edit"
-                      data-tooltip-place="top"
-                      className="hover:text-primary"
-                      onClick={() => router.push(`/admins/edit/${item.id}`)}
-                    >
-                      <Tooltip {..._TooltipDefaultParams({ id: "edit" })} />
-                      <span className="sr-only">Edit Admin </span>
-                      <PencilSquareIcon />
-                    </button>
-                  </div>
-                </TableCell>
-              </TableRow>
-            );
-          })}
+                  <TableCell className="text-start xl:pr-7.5">
+                    <div className="flex items-center justify-start gap-x-3.5">
+                      <button
+                        data-tooltip-id="delete"
+                        data-tooltip-content="Delete"
+                        data-tooltip-place="top"
+                        className="hover:text-red-500"
+                        onClick={() => {
+                          setCurrentUser(item);
+                          setIsModalOpen(true);
+                        }}
+                      >
+                        <Tooltip {..._TooltipDefaultParams({ id: "delete" })} />
+                        <span className="sr-only">Delete Admin </span>
+                        <TrashIcon />
+                      </button>
+                      <button
+                        data-tooltip-id="change-status"
+                        data-tooltip-content="Change status"
+                        data-tooltip-place="top"
+                        className="hover:text-yellow-dark"
+                        onClick={() => {
+                          setCurrentUser(item);
+                          setIsChangeStatusModalOpen(true);
+                        }}
+                      >
+                        <Tooltip
+                          {..._TooltipDefaultParams({ id: "change-status" })}
+                        />
+                        <span className="sr-only">Change Admin Status</span>
+                        <UserSettingIcon />
+                      </button>
+                      <button
+                        data-tooltip-id="edit"
+                        data-tooltip-content="Edit"
+                        data-tooltip-place="top"
+                        className="hover:text-primary"
+                        onClick={() => router.push(`/admins/edit/${item.id}`)}
+                      >
+                        <Tooltip {..._TooltipDefaultParams({ id: "edit" })} />
+                        <span className="sr-only">Edit Admin </span>
+                        <PencilSquareIcon />
+                      </button>
+                    </div>
+                  </TableCell>
+                </TableRow>
+              );
+            })
+          )}
         </TableBody>
       </Table>
       <Modal
@@ -150,9 +162,16 @@ const AdminsTable = () => {
       <Modal
         isOpen={isFilterModalOpen}
         onClose={() => setIsFilterModalOpen(false)}
-        classNames="w-full"
+        classNames="w-3/4"
+        showButtons={false}
       >
-        <AdminListFilters />
+        <AdminListFilters
+          filterRegister={filterRegister}
+          handleFilterSubmit={handleFilterSubmit}
+          isMutating={isMutating as number}
+          search={search}
+          setIsFilterModalOpen={setIsFilterModalOpen}
+        />
       </Modal>
       {isModalOpen && (
         <ConfirmationModal
diff --git a/src/components/Tables/admins/useAdminListFilterPresenter.ts b/src/components/Tables/admins/useAdminListFilterPresenter.ts
deleted file mode 100644
index bd3fd97..0000000
--- a/src/components/Tables/admins/useAdminListFilterPresenter.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useForm } from "react-hook-form";
-
-const useAdminListFilterPresenter = () => {
-  const { register } = useForm();
-  return {
-    register,
-  };
-};
-
-export default useAdminListFilterPresenter;
diff --git a/src/components/Tables/admins/useAdminsPresenter.ts b/src/components/Tables/admins/useAdminsPresenter.ts
index 1f4cca8..b90ee65 100644
--- a/src/components/Tables/admins/useAdminsPresenter.ts
+++ b/src/components/Tables/admins/useAdminsPresenter.ts
@@ -2,12 +2,14 @@
 
 import { apiDefaultParams } from "@/constants/Api_Params";
 import { AdminStatus } from "@/constants/enums";
+import { deleteEmptyKeys } from "@/utils/shared";
 import {
-  useAdminListInfiniteQuery,
   useChangeAdminStatus,
   useDeleteAdmin,
+  useGetAdminListQuery,
 } from "@/hooks/queries";
-import { IUser, TChangeAdminStatusCredentials } from "@/lib/api";
+import { API_ENDPOINTS, IUser, TChangeAdminStatusCredentials } from "@/lib/api";
+import { useIsMutating, useQueryClient } from "@tanstack/react-query";
 import { usePathname, useRouter } from "next/navigation";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
@@ -20,7 +22,12 @@ export const useAdminsPresenter = () => {
   const [status, setStatus] = useState<string>(
     currentUser?.status ?? AdminStatus.ACTIVE,
   );
+  const isMutating = useIsMutating();
   const router = useRouter();
+  const { register: filterRegister, handleSubmit: handleFilterSubmit } =
+    useForm();
+  const queryClient = useQueryClient();
+
   const {
     register,
     formState: { errors },
@@ -33,9 +40,11 @@ export const useAdminsPresenter = () => {
   });
   const [params, setParams] = useState<Record<string, any>>({
     ...apiDefaultParams,
+    offset: 0,
+    limit: 10,
   });
   const pathName = usePathname();
-  const { data, isPending } = useAdminListInfiniteQuery(params);
+  const { data, isPending } = useGetAdminListQuery(params);
   const { mutate: deleteAdmin } = useDeleteAdmin(() => {
     setIsModalOpen(false);
   });
@@ -51,7 +60,16 @@ export const useAdminsPresenter = () => {
       setIsChangeStatusModalOpen(false);
     },
   });
-  const allUsers = data?.pages.flatMap((page) => page.data.users) ?? [];
+
+  const search = (data: any) => {
+    setParams((prevParams) => {
+      const newParams = { ...prevParams, ...data, offset: 0 };
+      return deleteEmptyKeys(newParams);
+    });
+    setIsFilterModalOpen(false);
+  };
+  const allUsers = data?.data?.users ?? [];
+  const metadata = data?.meta;
   const columns = [
     "row",
     "full name",
@@ -63,11 +81,13 @@ export const useAdminsPresenter = () => {
   ];
   return {
     allUsers,
+    metadata,
     columns,
     isPending,
     onConfirmDelete,
     isModalOpen,
     setIsModalOpen,
+    isMutating,
     router,
     setCurrentUser,
     pathName,
@@ -82,5 +102,9 @@ export const useAdminsPresenter = () => {
     handleSubmit,
     isFilterModalOpen,
     setIsFilterModalOpen,
+    setParams,
+    filterRegister,
+    handleFilterSubmit,
+    search,
   };
 };
diff --git a/src/hooks/queries/index.ts b/src/hooks/queries/index.ts
index 08dff37..0ed721c 100644
--- a/src/hooks/queries/index.ts
+++ b/src/hooks/queries/index.ts
@@ -1,6 +1,16 @@
-export * from "./useUsersQueries";
 export * from "./useCompaniesQueries";
-export * from "./useTenders";
 export * from "./useCustomerQueries";
+export * from "./useFeedbackQueries";
 export * from "./useProfileQueries";
-export * from "./useFeedbackQueries"
\ No newline at end of file
+export * from "./useTenders";
+export * from "./useUsersQueries";
+
+export * from "./useCompaniesQueries";
+export * from "./useCustomerQueries";
+export * from "./useFeedbackQueries";
+export * from "./useFlagsQueries";
+export * from "./useNotificationQueries";
+export * from "./useProfileQueries";
+export * from "./useTenders";
+export * from "./useUsersQueries";
+export * from "./useAdminListQuery";
diff --git a/src/hooks/queries/useAdminListQuery.ts b/src/hooks/queries/useAdminListQuery.ts
new file mode 100644
index 0000000..2b4a073
--- /dev/null
+++ b/src/hooks/queries/useAdminListQuery.ts
@@ -0,0 +1,11 @@
+import { API_ENDPOINTS, userService } from "@/lib/api";
+import { useQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
+
+export const useGetAdminListQuery = (params?: Record<string, any>) => {
+  const queryKey = useMemo(() => [API_ENDPOINTS.USER.ADMINS, params], [params]);
+  return useQuery({
+    queryKey,
+    queryFn: () => userService.adminsList(params),
+  });
+};
\ No newline at end of file
diff --git a/src/utils/shared.ts b/src/utils/shared.ts
index dd9ee0e..61eec7a 100644
--- a/src/utils/shared.ts
+++ b/src/utils/shared.ts
@@ -98,3 +98,15 @@ export function parseWithSchema<T>(
     throw new Error(`ERROR caught in ${errorContext}`);
   }
 }
+
+export const deleteEmptyKeys = (obj: Record<string, any>) => {
+  const newObj = { ...obj };
+  for (const key in newObj) {
+    if (Object.prototype.hasOwnProperty.call(newObj, key)) {
+      if (!newObj[key]) {
+        delete newObj[key];
+      }
+    }
+  }
+  return newObj;
+};