diff --git a/client/src/pages/ldap-query-builder-page.tsx b/client/src/pages/ldap-query-builder-page.tsx
index 73b3b00..8f77259 100644
--- a/client/src/pages/ldap-query-builder-page.tsx
+++ b/client/src/pages/ldap-query-builder-page.tsx
@@ -80,28 +80,28 @@ const LdapQueryBuilderPage = () => {
 
   // Query to get LDAP connections
   const { 
-    data: connections,
+    data: connections = [],
     isLoading: connectionsLoading 
-  } = useQuery({
+  } = useQuery<LdapConnection[]>({
     queryKey: ["/api/ldap-connections"],
     enabled: !!user
   });
 
   // Query to get LDAP filters for the selected connection
   const { 
-    data: filters,
+    data: filters = [],
     isLoading: filtersLoading 
-  } = useQuery({
+  } = useQuery<LdapFilter[]>({
     queryKey: ["/api/connections", selectedConnectionId, "ldap-filters"],
     enabled: !!selectedConnectionId,
   });
 
   // Query to get LDAP filter revisions
   const { 
-    data: revisions,
+    data: revisions = [],
     isLoading: revisionsLoading,
     refetch: refetchRevisions
-  } = useQuery({
+  } = useQuery<LdapFilterRevision[]>({
     queryKey: ["/api/ldap-filters", selectedFilter?.id, "revisions"],
     enabled: !!selectedFilter?.id && showRevisionsDialog,
   });
diff --git a/server/storage.ts b/server/storage.ts
index 766d111..8fe9e7a 100644
--- a/server/storage.ts
+++ b/server/storage.ts
@@ -590,12 +590,12 @@ export class DatabaseStorage implements IStorage {
       
       // Apply where conditions if any
       if (whereClause) {
-        baseQuery = baseQuery.where(whereClause);
+        baseQuery = baseQuery.where(whereClause as any);
       }
       
       // Apply ordering if any
-      if (orderClauses.length > 0) {
-        baseQuery = baseQuery.orderBy(...orderClauses);
+      if (orderClauses && orderClauses.length > 0) {
+        baseQuery = baseQuery.orderBy(...(orderClauses as any[]));
       }
       
       // Apply pagination if specified
@@ -611,7 +611,7 @@ export class DatabaseStorage implements IStorage {
       const users = await baseQuery;
       
       // Handle field selection if specified
-      if (selectedFields.length > 0) {
+      if (selectedFields && selectedFields.length > 0) {
         const result = users.map(user => {
           const filtered: Partial<AdUser> = { id: user.id };
           selectedFields.forEach(field => {
@@ -679,12 +679,12 @@ export class DatabaseStorage implements IStorage {
       
       // Apply where conditions if any
       if (whereClause) {
-        baseQuery = baseQuery.where(whereClause);
+        baseQuery = baseQuery.where(whereClause as any);
       }
       
       // Apply ordering if any
-      if (orderClauses.length > 0) {
-        baseQuery = baseQuery.orderBy(...orderClauses);
+      if (orderClauses && orderClauses.length > 0) {
+        baseQuery = baseQuery.orderBy(...(orderClauses as any[]));
       }
       
       // Apply pagination if specified
@@ -700,7 +700,7 @@ export class DatabaseStorage implements IStorage {
       const groups = await baseQuery;
       
       // Handle field selection if specified
-      if (selectedFields.length > 0) {
+      if (selectedFields && selectedFields.length > 0) {
         const result = groups.map(group => {
           const filtered: Partial<AdGroup> = { id: group.id };
           selectedFields.forEach(field => {