diff --git a/src/components/DataTable/DataTable.tsx b/src/components/DataTable/DataTable.tsx
index 8dec631..02fcb9f 100644
--- a/src/components/DataTable/DataTable.tsx
+++ b/src/components/DataTable/DataTable.tsx
@@ -29,8 +29,8 @@ export function DataTable({
 	sorting: SortingState;
 	setSorting: Dispatch<SetStateAction<SortingState>>;
 	filtersEnabled: boolean;
-	globalFilter: string;
-	setGlobalFilter: Dispatch<SetStateAction<string>>;
+	globalFilter: string | number;
+	setGlobalFilter: Dispatch<SetStateAction<string | number>>;
 	isRefreshing?: boolean;
 }) {
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
diff --git a/src/pages/settings/components/GuacamoleClients/GuacamoleClients.tsx b/src/pages/settings/components/GuacamoleClients/GuacamoleClients.tsx
index 3b604a5..772c938 100644
--- a/src/pages/settings/components/GuacamoleClients/GuacamoleClients.tsx
+++ b/src/pages/settings/components/GuacamoleClients/GuacamoleClients.tsx
@@ -64,8 +64,14 @@ const GuacamoleClients = () => {
 	useEffect(() => {
 		if (guacamoleClientsData && guacamoleClientsIsFetched) {
 			setGuacamoleClients(
-				guacamoleClientsData.filter((a: GuacamoleClient) =>
-					a.clientName.toLowerCase().includes((debouncedSearch as string).toLowerCase()),
+				guacamoleClientsData.filter(
+					(a: GuacamoleClient) =>
+						a.clientName
+							.toLowerCase()
+							.includes((debouncedSearch as string).toLowerCase()) ||
+						a.clientIdentifier
+							.toLowerCase()
+							.includes((debouncedSearch as string).toLowerCase()),
 				),
 			);
 		}
diff --git a/src/pages/settings/components/Search/SearchHistory.tsx b/src/pages/settings/components/Search/SearchHistory.tsx
index b634d1e..b4d8ad9 100644
--- a/src/pages/settings/components/Search/SearchHistory.tsx
+++ b/src/pages/settings/components/Search/SearchHistory.tsx
@@ -23,7 +23,7 @@ const SearchHistory = () => {
 	const [isLoading, setIsLoading] = useState(false);
 	const { isMobile, handleDelete } = useCommonHooks();
 	const [filtersEnabled, setFiltersEnabled] = useState(false);
-	const [globalFilter, setGlobalFilter] = useState<string>('');
+	const [globalFilter, setGlobalFilter] = useState<string | number>('');
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const handleClose = () => {
 		closeModal();
diff --git a/src/pages/settings/components/Search/SearchProviders.tsx b/src/pages/settings/components/Search/SearchProviders.tsx
index 212f02f..a911b3e 100644
--- a/src/pages/settings/components/Search/SearchProviders.tsx
+++ b/src/pages/settings/components/Search/SearchProviders.tsx
@@ -80,7 +80,8 @@ const SearchProviderSettings = () => {
 					.filter(
 						(a: Provider) =>
 							a.name.toLowerCase().includes((debouncedSearch as string).toLowerCase()) ||
-							a.url.toLowerCase().includes((debouncedSearch as string).toLowerCase()),
+							a.url.toLowerCase().includes((debouncedSearch as string).toLowerCase()) ||
+							a.prefix.toLowerCase().includes((debouncedSearch as string).toLowerCase()),
 					)
 					.sort((a: Provider, b: Provider) => (a.prefix > b.prefix ? 1 : -1)),
 			);
diff --git a/src/pages/settings/components/WoL/WolClients.tsx b/src/pages/settings/components/WoL/WolClients.tsx
index b55ad92..b4b2df1 100644
--- a/src/pages/settings/components/WoL/WolClients.tsx
+++ b/src/pages/settings/components/WoL/WolClients.tsx
@@ -59,8 +59,14 @@ const WolClientSettings = () => {
 	useEffect(() => {
 		if (wolClientsData && wolClientsIsFetched) {
 			setWolClients(
-				wolClientsData.filter((a: WolClient) =>
-					a.hostname.toLowerCase().includes((debouncedSearch as string).toLowerCase()),
+				wolClientsData.filter(
+					(a: WolClient) =>
+						a.hostname
+							.toLowerCase()
+							.includes((debouncedSearch as string).toLowerCase()) ||
+						a.macAddress
+							.toLowerCase()
+							.includes((debouncedSearch as string).toLowerCase()),
 				),
 			);
 		}