diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js
index 3a56486..0c247ca 100755
--- a/server/src/resolvers/Query.js
+++ b/server/src/resolvers/Query.js
@@ -120,8 +120,10 @@ const Query = {
     })
 
     const userPresences = usersWithWifiDevices
-      .filter(user =>
-        user.displayName.toLowerCase().includes(search.toLowerCase())
+      .filter(
+        user =>
+          user.displayName.toLowerCase().includes(search.toLowerCase()) ||
+          user.WifiDevice[0].apName.toLowerCase().includes(search.toLowerCase())
       )
       .map(user => ({
         user: {
diff --git a/server/src/utils/ciscoController.js b/server/src/utils/ciscoController.js
index f722cb9..ad79b07 100644
--- a/server/src/utils/ciscoController.js
+++ b/server/src/utils/ciscoController.js
@@ -59,7 +59,7 @@ export async function getOnlineWifiDevices() {
     ip: client.IP,
     uptime: client.UT.toString(),
     apName: client.AP,
-    status: 'ONLINE'
+    status: client.ST == 'Online' ? 'ONLINE' : 'OFFLINE'
   }))
 
   return hydratedOnlineDevices
diff --git a/server/src/utils/wifiUtils.js b/server/src/utils/wifiUtils.js
index d12c7b4..e8c37fc 100644
--- a/server/src/utils/wifiUtils.js
+++ b/server/src/utils/wifiUtils.js
@@ -4,6 +4,8 @@ import { getOnlineWifiDevices as getOnlineCiscoDevices } from './ciscoController
 import prisma from '../prisma'
 
 async function updateDBWithOnlineDevices() {
+  // TODO: debounce multiple requests
+
   const onlineUnifiDevicesPromise = getOnlineUnifiDevices()
   const onlineCiscoDevicesPromise = getOnlineCiscoDevices()