diff --git a/app/client/public/apple-touch-icon.png b/app/client/public/apple-touch-icon.png
index 8ba4c840..e893083a 100644
Binary files a/app/client/public/apple-touch-icon.png and b/app/client/public/apple-touch-icon.png differ
diff --git a/app/client/public/index.html b/app/client/public/index.html
index 37f2e155..ef2255f5 100644
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -11,12 +11,12 @@
       name="description"
       content="Luck Info Hunter"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="%PUBLIC_URL%/site.webmanifest" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/app/client/src/domain/searchSyntax.test.ts b/app/client/src/domain/searchSyntax.test.ts
new file mode 100644
index 00000000..c1421429
--- /dev/null
+++ b/app/client/src/domain/searchSyntax.test.ts
@@ -0,0 +1,17 @@
+import { formatAdvancedSearchText, formatAdvancedSearchValue } from "./searchSyntax";
+
+test('formatAdvancedSearchValue keeps simple values unquoted', () => {
+    expect(formatAdvancedSearchValue('Inbox')).toBe('Inbox');
+});
+
+test('formatAdvancedSearchValue quotes values with spaces', () => {
+    expect(formatAdvancedSearchValue('Daily Reads')).toBe('"Daily Reads"');
+});
+
+test('formatAdvancedSearchValue escapes quotes inside quoted values', () => {
+    expect(formatAdvancedSearchValue('Daily "Reads"')).toBe('"Daily \\"Reads\\""');
+});
+
+test('formatAdvancedSearchText returns prefixed text with trailing space', () => {
+    expect(formatAdvancedSearchText('collection:', 'Daily Reads')).toBe('collection:"Daily Reads" ');
+});
diff --git a/app/client/src/domain/searchSyntax.ts b/app/client/src/domain/searchSyntax.ts
new file mode 100644
index 00000000..c5d41958
--- /dev/null
+++ b/app/client/src/domain/searchSyntax.ts
@@ -0,0 +1,18 @@
+export function formatAdvancedSearchValue(value: string) {
+    const trimmedValue = value.trim();
+
+    if (!trimmedValue) {
+        return '';
+    }
+
+    if (!/[\s"]/.test(trimmedValue)) {
+        return trimmedValue;
+    }
+
+    return `"${trimmedValue.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+}
+
+export function formatAdvancedSearchText(prefix: string, value: string) {
+    const formattedValue = formatAdvancedSearchValue(value);
+    return formattedValue ? `${prefix}${formattedValue} ` : undefined;
+}
diff --git a/app/client/src/pages/CollectionList.tsx b/app/client/src/pages/CollectionList.tsx
index 5c679263..6d58336a 100644
--- a/app/client/src/pages/CollectionList.tsx
+++ b/app/client/src/pages/CollectionList.tsx
@@ -11,6 +11,7 @@ import InboxOutlinedIcon from "@mui/icons-material/InboxOutlined";
 import { Icon } from "@iconify/react";
 import { Box, SvgIconProps } from "@mui/material";
 import { useTranslation } from "react-i18next";
+import { formatAdvancedSearchText } from "../domain/searchSyntax";
 
 // Custom icon component for collections that can display emoji, iconify icons, or default folder
 const CollectionIconComponent = React.forwardRef<SVGSVGElement, SvgIconProps & { collectionIcon?: string | null }>(
@@ -124,7 +125,7 @@ const CollectionList = () => {
     // Add trailing space so users can directly type additional keywords
     const searchText = useMemo(() => {
         if (!isUnsorted && collection?.name) {
-            return `collection:${collection.name} `;
+            return formatAdvancedSearchText('collection:', collection.name);
         }
         return undefined;
     }, [isUnsorted, collection?.name]);
diff --git a/app/server/huntly-server/src/main/java/com/huntly/server/service/LuceneService.java b/app/server/huntly-server/src/main/java/com/huntly/server/service/LuceneService.java
index 0b42bc0a..76afee1d 100644
--- a/app/server/huntly-server/src/main/java/com/huntly/server/service/LuceneService.java
+++ b/app/server/huntly-server/src/main/java/com/huntly/server/service/LuceneService.java
@@ -447,11 +447,11 @@ public PageSearchResult searchPages(@NonNull SearchQuery searchQuery) {
         return searchResult;
     }
 
-    private CompleteSearch extractCompleteSearch(String keyword) {
+    CompleteSearch extractCompleteSearch(String keyword) {
         CompleteSearch completeSearch = new CompleteSearch();
         completeSearch.setAdvancedSearches(new ArrayList<>());
         completeSearch.setCollectionIds(new ArrayList<>());
-        String[] keywords = keyword.split(" ");
+        List<String> keywords = splitSearchTokens(keyword);
         List<String> simpleWords = new ArrayList<>();
         for (String key : keywords) {
             if (StringUtils.isBlank(key)) {
@@ -482,14 +482,70 @@ private CompleteSearch extractCompleteSearch(String keyword) {
     private AdvancedSearch extractAdvancedSearch(String key, String docField, String seperator) {
         AdvancedSearch advancedSearch = new AdvancedSearch();
         advancedSearch.setDocField(docField);
-        String[] parts = key.split(seperator);
-        if (parts.length == 2) {
-            advancedSearch.setKeyword(parts[1]);
-        }
+        advancedSearch.setKeyword(extractAdvancedSearchKeyword(key, seperator));
         advancedSearch.words = segmentWords(advancedSearch.getKeyword(), true);
         return advancedSearch;
     }
 
+    static String extractAdvancedSearchKeyword(String key, String separator) {
+        int separatorIndex = key.indexOf(separator);
+        if (separatorIndex < 0) {
+            return "";
+        }
+        return key.substring(separatorIndex + separator.length()).trim();
+    }
+
+    static List<String> splitSearchTokens(String keyword) {
+        List<String> tokens = new ArrayList<>();
+        if (StringUtils.isBlank(keyword)) {
+            return tokens;
+        }
+
+        StringBuilder token = new StringBuilder();
+        boolean inQuotes = false;
+        boolean escaping = false;
+
+        for (int i = 0; i < keyword.length(); i++) {
+            char current = keyword.charAt(i);
+
+            if (escaping) {
+                token.append(current);
+                escaping = false;
+                continue;
+            }
+
+            if (inQuotes && current == '\\') {
+                escaping = true;
+                continue;
+            }
+
+            if (current == '"') {
+                inQuotes = !inQuotes;
+                continue;
+            }
+
+            if (!inQuotes && Character.isWhitespace(current)) {
+                if (token.length() > 0) {
+                    tokens.add(token.toString());
+                    token.setLength(0);
+                }
+                continue;
+            }
+
+            token.append(current);
+        }
+
+        if (escaping) {
+            token.append('\\');
+        }
+
+        if (token.length() > 0) {
+            tokens.add(token.toString());
+        }
+
+        return tokens;
+    }
+
     private SearchOption parseSearchOption(String options) {
         SearchOption option = new SearchOption();
         if (StringUtils.isNotBlank(options)) {
@@ -542,6 +598,9 @@ private SearchOption parseSearchOption(String options) {
 
     private List<String> segmentWords(String keyword, boolean useSmart) {
         List<String> words = new ArrayList<>();
+        if (StringUtils.isBlank(keyword)) {
+            return words;
+        }
         StringReader sr = new StringReader(keyword);
         IKSegmenter segmenter = new IKSegmenter(sr, useSmart);
         Lexeme lexeme = null;
diff --git a/app/server/huntly-server/src/test/java/com/huntly/server/service/LuceneServiceSearchSyntaxTest.java b/app/server/huntly-server/src/test/java/com/huntly/server/service/LuceneServiceSearchSyntaxTest.java
new file mode 100644
index 00000000..9cc26bc6
--- /dev/null
+++ b/app/server/huntly-server/src/test/java/com/huntly/server/service/LuceneServiceSearchSyntaxTest.java
@@ -0,0 +1,58 @@
+package com.huntly.server.service;
+
+import com.huntly.server.config.HuntlyProperties;
+import com.huntly.server.domain.entity.Collection;
+import com.huntly.server.repository.CollectionRepository;
+import com.huntly.server.repository.PageRepository;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class LuceneServiceSearchSyntaxTest {
+
+    @Test
+    void splitSearchTokens_keepsQuotedAdvancedSearchValueTogether() {
+        List<String> tokens = LuceneService.splitSearchTokens("machine collection:\"Daily Reads\" author:\"Jane Doe\"");
+
+        assertThat(tokens).containsExactly("machine", "collection:Daily Reads", "author:Jane Doe");
+    }
+
+    @Test
+    void splitSearchTokens_unescapesQuotedCharactersInsideQuotedValue() {
+        List<String> tokens = LuceneService.splitSearchTokens("collection:\"Daily \\\"Reads\\\"\"");
+
+        assertThat(tokens).containsExactly("collection:Daily \"Reads\"");
+    }
+
+    @Test
+    void extractAdvancedSearchKeyword_usesFirstSeparatorOnly() {
+        String keyword = LuceneService.extractAdvancedSearchKeyword("url:https://example.com/a:b", ":");
+
+        assertThat(keyword).isEqualTo("https://example.com/a:b");
+    }
+
+    @Test
+    void extractCompleteSearch_usesQuotedCollectionNameForCollectionFilter() {
+        CollectionRepository collectionRepository = mock(CollectionRepository.class);
+        Collection collection = new Collection();
+        collection.setId(42L);
+        collection.setName("Daily Reads");
+        when(collectionRepository.findByNameContainingIgnoreCase("Daily Reads")).thenReturn(List.of(collection));
+
+        LuceneService luceneService = new LuceneService(
+                mock(PageRepository.class),
+                mock(PageListService.class),
+                new HuntlyProperties(),
+                collectionRepository
+        );
+
+        LuceneService.CompleteSearch completeSearch = luceneService.extractCompleteSearch("machine collection:\"Daily Reads\"");
+
+        assertThat(completeSearch.getKeyword()).isEqualTo("machine");
+        assertThat(completeSearch.getCollectionIds()).containsExactly(42L);
+    }
+}