diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts
index ca538ec3e..9a945a3a4 100644
--- a/packages/api/src/services/library_item.ts
+++ b/packages/api/src/services/library_item.ts
@@ -324,17 +324,16 @@ export const buildQueryString = (
               // return only deleted pages within 14 days
               return "(library_item.state = 'DELETED' AND library_item.deleted_at >= NOW() - INTERVAL '14 days')"
             default: {
-              let sql = 'library_item.archived_at IS NULL'
               if (useFolders) {
                 const param = `folder_${parameters.length}`
                 const folderSql = escapeQueryWithParameters(
                   `library_item.folder = :${param}`,
                   { [param]: value }
                 )
-                sql = `(${sql} AND ${folderSql})`
+                return `(library_item.archived_at IS NULL AND ${folderSql})`
               }
 
-              return sql
+              return '(library_item.archived_at IS NULL AND library_item.folder IS NOT NULL)'
             }
           }
         }
@@ -656,7 +655,7 @@ export const createSearchQueryBuilder = (
   const orders: Sort[] = []
   let queryString: string | null = null
 
-  if (args.query) {
+  if (args.query !== null && args.query !== undefined) {
     const searchQuery = parseSearchQuery(args.query)
 
     // build query string and save parameters
diff --git a/packages/api/src/utils/search.ts b/packages/api/src/utils/search.ts
index 871c1d984..1fcbf7f11 100644
--- a/packages/api/src/utils/search.ts
+++ b/packages/api/src/utils/search.ts
@@ -17,7 +17,7 @@ export const parseSearchQuery = (query: string): LiqeQuery => {
 
   // by default we want to search in the inbox if no in: is specified
   if (!searchQuery.includes('in:')) {
-    searchQuery = `(${searchQuery}) in:inbox`
+    searchQuery = `in:inbox (${searchQuery})`
   }
 
   return parse(searchQuery)