diff --git a/Samples/AppContentSearch/README.md b/Samples/AppContentSearch/README.md
index ba7edfef1..73a132aab 100644
--- a/Samples/AppContentSearch/README.md
+++ b/Samples/AppContentSearch/README.md
@@ -16,9 +16,17 @@ extendedZipContent:
 
 # AppContentSearch Sample Application
 
-This sample demonstrates how to use App Content Search's **AppContentIndex APIs** in a **WinUI3** notes application. It shows how to create, manage, and semantically search through the index that includes both text content and images. It also shows how to use use the search results to enable retrieval augmented genaration (RAG) scenarios with language models.
+This sample demonstrates how to use App Content Search's
+**AppContentIndex APIs** in a **WinUI3** notes application.
+It shows how to create, manage, and semantically search
+through the index that includes both text content and images.
+It also shows how to use the search results to enable
+retrieval augmented generation (RAG) scenarios with language
+models. 
 
-> **Note**: This sample is targeted and tested for **Windows App SDK 2.0 Experimental2** and **Visual Studio 2022**. The AppContentSearch APIs are experimental and available in Windows App SDK 2.0 experimental2.
+> **Note**: This sample is targeted and tested for
+> **Windows App SDK 2.0 Preview1** and
+> **Visual Studio 2022**.
 
 
 ## Features
@@ -42,7 +50,7 @@ This sample demonstrates:
 
 ## Building and Running the Sample
 
-* Open the solution file (`AppContentSearch.sln`) in Visual Studio.
+* Open the solution file (`NotesApp.sln`) in Visual Studio.
 * Press Ctrl+Shift+B, or select **Build** \> **Build Solution**.
 * Run the application to see the Notes app with integrated search functionality.
 
diff --git a/Samples/AppContentSearch/cs-winui/AI/Provider/FoundryAIProvider.cs b/Samples/AppContentSearch/cs-winui/AI/Provider/FoundryAIProvider.cs
index f3a449905..bd3949cb3 100644
--- a/Samples/AppContentSearch/cs-winui/AI/Provider/FoundryAIProvider.cs
+++ b/Samples/AppContentSearch/cs-winui/AI/Provider/FoundryAIProvider.cs
@@ -1,10 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 
-using Microsoft.AI.Foundry.Local;
-using Microsoft.Extensions.AI;
-using Notes.ViewModels;
-using OpenAI;
-using OpenAI.Chat;
 using System;
 using System.ClientModel;
 using System.Collections.Generic;
@@ -13,6 +8,11 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AI.Foundry.Local;
+using Microsoft.Extensions.AI;
+using Notes.ViewModels;
+using OpenAI;
+using OpenAI.Chat;
 using Windows.Storage;
 using AppChatRole = Notes.ViewModels.ChatRole;
 using ExtChatRole = Microsoft.Extensions.AI.ChatRole;
@@ -143,7 +143,8 @@ public async IAsyncEnumerable<ChatResponseUpdate> SendStreamingRequestAsync(
                     break;
                 }
 
-                if (!hasNext) break;
+                if (!hasNext)
+                    break;
 
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -175,7 +176,7 @@ private bool HasCachedModels()
     {
         try
         {
-            var foundryManager = new FoundryLocalManager();
+            using var foundryManager = new FoundryLocalManager();
             var cached = foundryManager.ListCachedModelsAsync().GetAwaiter().GetResult();
             return cached.Count > 0;
         }
@@ -187,7 +188,8 @@ private bool HasCachedModels()
 
     private async Task EnsureFoundryClientAsync(CancellationToken ct)
     {
-        if (_foundryClient != null && _foundryChatClient != null) return;
+        if (_foundryClient != null && _foundryChatClient != null)
+            return;
 
         var settings = ApplicationData.Current.LocalSettings;
         string alias = (settings.Values[FoundryModelKey] as string)?.Trim() ?? "";
@@ -195,7 +197,7 @@ private async Task EnsureFoundryClientAsync(CancellationToken ct)
         {
             try
             {
-                var foundryManager = new FoundryLocalManager();
+                using var foundryManager = new FoundryLocalManager();
 
                 var cached = await foundryManager.ListCachedModelsAsync();
                 if (cached.Count != 0)
@@ -269,4 +271,4 @@ private ChatResponseUpdate Append(SessionEntryViewModel entry, string text, Chat
 
         return list;
     }
-}
\ No newline at end of file
+}
diff --git a/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml b/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml
index 567630d56..a774d94dd 100644
--- a/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml
+++ b/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml
@@ -100,6 +100,20 @@
                             </ItemsView.Layout>
                         </ItemsView>
                     </StackPanel>
+
+                    <!-- OCR Text Results List -->
+                    <StackPanel Visibility="{x:Bind ViewModel.ShowOcrResults, Mode=OneWay}">
+                        <TextBlock x:Name="OcrResultsTextBlock"
+                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}" Margin="4,12">OCR Text Results</TextBlock>
+
+                        <ItemsView x:Name="resultsOcrItemsView"
+                                   ItemsSource="{x:Bind ViewModel.OcrResults}"
+                                   ItemInvoked="ResultsItemsView_ItemInvoked"
+                                   IsItemInvokedEnabled="True"
+                                   SelectionMode="None"
+                                   ItemTemplate="{StaticResource TextSearchResultDataTemplate}">
+                        </ItemsView>
+                    </StackPanel>
                     
 
                     <!-- Text Results List -->
@@ -127,7 +141,8 @@
                     Height="32"
                     Width="400"
                     PlaceholderText="Search for anything..."
-                    QuerySubmitted="SearchBox_QuerySubmitted">
+                    QuerySubmitted="SearchBox_QuerySubmitted"
+                    TextChanged="SearchBox_TextChanged">
                     <AutoSuggestBox.QueryIcon>
                         <FontIcon
                             x:Name="SearchBoxQueryIcon"
diff --git a/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml.cs b/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml.cs
index f95b25989..bcf809d8c 100644
--- a/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml.cs
+++ b/Samples/AppContentSearch/cs-winui/Controls/SearchView.xaml.cs
@@ -22,6 +22,7 @@ public sealed partial class SearchView : UserControl
         public SearchView()
         {
             this.InitializeComponent();
+            this.Unloaded += (_, _) => ViewModel.Dispose();
         }
 
         private void HideResultsPanel()
@@ -31,7 +32,6 @@ private void HideResultsPanel()
 
         private async void ResultsItemsView_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEventArgs e)
         {
-            var context = await AppDataContext.GetCurrentAsync();
             var item = e.InvokedItem as SearchResult;
 
             if (MainWindow.Instance != null && item != null)
@@ -40,8 +40,24 @@ private async void ResultsItemsView_ItemInvoked(ItemsView sender, ItemsViewItemI
                 {
                     await MainWindow.Instance.SelectNoteById(item.SourceId);
                 }
+                else if (item.ContentType == ContentType.OcrText)
+                {
+                    if (item.AttachmentId is int attachmentId)
+                    {
+                        await MainWindow.Instance.SelectNoteById(
+                            item.SourceId,
+                            attachmentId,
+                            item.MostRelevantSentence,
+                            item.BoundingBox);
+                    }
+                    else
+                    {
+                        await MainWindow.Instance.SelectNoteById(item.SourceId);
+                    }
+                }
                 else
                 {
+                    var context = await AppDataContext.GetCurrentAsync();
                     var attachment = context.Attachments.Where(a => a.Id == item.SourceId).FirstOrDefault();
 
                     if (attachment != null)
@@ -138,6 +154,23 @@ private void SearchBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuery
             ViewModel.HandleQuerySubmitted(sender.Text);
         }
 
+        private void SearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+        {
+            // Only react to user input, not programmatic changes
+            if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
+            {
+                ViewModel.HandleTextChanged(sender.Text);
+            }
+        }
+
+        public void InitializeQuerySessions()
+        {
+            if (MainWindow.AppContentIndexer != null)
+            {
+                ViewModel.InitializeQuerySessions(MainWindow.AppContentIndexer, DispatcherQueue);
+            }
+        }
+
         private void ItemContainer_BringIntoViewRequested(UIElement sender, BringIntoViewRequestedEventArgs args)
         {
             // When the popup is being hidden we get a spurious BringIntoView request which the Repeater doesn't handle well.
diff --git a/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs b/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs
index 14dce1859..e47bacb99 100644
--- a/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs
+++ b/Samples/AppContentSearch/cs-winui/MainWindow.xaml.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
+using Microsoft.Windows.Search.AppContentIndex;
 using Notes.Controls;
 using Notes.Pages;
 using Notes.ViewModels;
@@ -11,6 +11,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.Foundation.Collections;
 
 namespace Notes
 {
@@ -20,11 +21,13 @@ public sealed partial class MainWindow : Window
         private static SearchView? _searchView;
         private static MainWindow? _instance;
         private static AppContentIndexer? _appContentIndexer;
+        private static IndexCapabilitiesOfCurrentSystem? _systemCapabilities;
 
         public static ChatSessionView? ChatSessionView => _chatSessionView;
         public static SearchView? SearchView => _searchView;
         public static MainWindow? Instance => _instance;
         public static AppContentIndexer? AppContentIndexer => _appContentIndexer;
+        public static IndexCapabilitiesOfCurrentSystem? SystemCapabilities => _systemCapabilities;
 
         public ViewModel VM;
 
@@ -47,6 +50,12 @@ public MainWindow()
 
             VM.Notes.CollectionChanged += Notes_CollectionChanged;
 
+            this.Closed += (_, _) =>
+            {
+                _appContentIndexer?.Dispose();
+                _appContentIndexer = null;
+            };
+
             _initializeAppContentIndexerTask = InitializeAppContentIndexerAsync();
 
             DispatcherQueue.TryEnqueue(async () =>
@@ -93,15 +102,123 @@ public async Task SelectNoteById(int id, int? attachmentId = null, string? attac
             }
         }
 
+        private static void CheckSystemCapabilities()
+        {
+            _systemCapabilities = AppContentIndexer.GetIndexCapabilitiesOfCurrentSystem();
+
+            var capabilities = new[]
+            {
+                IndexCapability.TextLexical,
+                IndexCapability.TextSemantic,
+                IndexCapability.ImageOcr,
+                IndexCapability.ImageSemantic
+            };
+
+            foreach (var capability in capabilities)
+            {
+                var status = _systemCapabilities.GetIndexCapabilityStatus(capability);
+                Debug.WriteLine($"System capability {capability}: {status}");
+
+                if (status == IndexCapabilityOfCurrentSystemStatus.DisabledByPolicy)
+                {
+                    Debug.WriteLine($"Warning: {capability} is disabled by policy.");
+                }
+                else if (status == IndexCapabilityOfCurrentSystemStatus.NotSupported)
+                {
+                    Debug.WriteLine($"Warning: {capability} is not supported on this system.");
+                }
+            }
+        }
+
+        private void SubscribeToIndexerListener()
+        {
+            if (_appContentIndexer is null)
+            {
+                return;
+            }
+
+            var listener = _appContentIndexer.Listener;
+
+            listener.IndexCapabilitiesChanged += (sender, capabilities) =>
+            {
+                if (capabilities.HasCapabilitiesWithErrors)
+                {
+                    var errors = capabilities.GetCapabilitiesWithErrors();
+                    foreach (var cap in errors)
+                    {
+                        var state = capabilities.GetCapabilityState(cap);
+                        Debug.WriteLine($"Index capability error — {cap}: {state.InitializationStatus}, {state.ErrorMessage}");
+                    }
+                }
+                else
+                {
+                    Debug.WriteLine("All index capabilities are healthy.");
+                }
+            };
+
+            listener.IndexStatisticsChanged += (sender, stats) =>
+            {
+                Debug.WriteLine($"Index statistics changed — Items: {stats.ItemCount}, " +
+                    $"Completed: {stats.CompletedCount}, InProgress: {stats.InProgressCount}, " +
+                    $"NotStarted: {stats.NotStartedCount}, Errors: {stats.ErrorsCount}, " +
+                    $"PendingDeletion: {stats.PendingDeletionCount}, " +
+                    $"RequiringReindexing: {stats.RequiringReindexingCount}");
+
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    if (stats.IndexingInProgress)
+                    {
+                        int total = stats.ItemCount;
+                        int completed = stats.CompletedCount;
+                        if (total > 0)
+                        {
+                            double percent = (double)completed / total * 100;
+                            _searchView?.SetIndexProgressBar(percent);
+                        }
+                    }
+                    else
+                    {
+                        _searchView?.SetSearchBoxIndexingCompleted();
+                    }
+                });
+            };
+
+            listener.ContentItemStatusChanged += (sender, statusMap) =>
+            {
+                foreach (var kvp in statusMap)
+                {
+                    Debug.WriteLine($"Content item '{kvp.Key}' status: {kvp.Value.Status}, Error: {kvp.Value.ErrorDetail}");
+                }
+            };
+        }
+
+        private static void LogIndexStatistics()
+        {
+            if (_appContentIndexer is null)
+            {
+                return;
+            }
+
+            var stats = _appContentIndexer.GetIndexStatistics();
+            Debug.WriteLine($"Index statistics — Items: {stats.ItemCount}, " +
+                $"Completed: {stats.CompletedCount}, InProgress: {stats.InProgressCount}, " +
+                $"NotStarted: {stats.NotStartedCount}, Errors: {stats.ErrorsCount}, " +
+                $"PendingDeletion: {stats.PendingDeletionCount}, " +
+                $"RequiringReindexing: {stats.RequiringReindexingCount}");
+        }
+
         private async Task InitializeAppContentIndexerAsync()
         {
             GetOrCreateIndexResult? getOrCreateResult = null;
             await Task.Run(() =>
             {
-                getOrCreateResult = Microsoft.Windows.AI.Search.Experimental.AppContentIndex.AppContentIndexer.GetOrCreateIndex("NotesIndex");
+                // Pre-flight: check system-level ACI capabilities before creating an index.
+                CheckSystemCapabilities();
+
+                getOrCreateResult = AppContentIndexer.GetOrCreateIndex("NotesIndex");
                 if (getOrCreateResult == null)
                 {
-                    throw new Exception("GetOrCreateIndexResult is null");
+                    throw new InvalidOperationException("GetOrCreateIndexResult is null");
                 }
                 if (!getOrCreateResult.Succeeded)
                 {
@@ -109,13 +226,21 @@ await Task.Run(() =>
                 }
 
                 _appContentIndexer = getOrCreateResult.Indexer;
+
+                LogIndexStatistics();
             });
 
+            // Subscribe to live status updates from the indexer.
+            SubscribeToIndexerListener();
+
             DispatcherQueue.TryEnqueue(() =>
             {
                 ChatPaneToggleButton.IsEnabled = true;
                 AppSearchView.SetSearchBoxInitializingCompleted();
 
+                // Initialize query sessions for search-as-you-type.
+                AppSearchView.InitializeQuerySessions();
+
                 var status = getOrCreateResult?.Status;
 
                 switch (status)
diff --git a/Samples/AppContentSearch/cs-winui/Notes.csproj b/Samples/AppContentSearch/cs-winui/Notes.csproj
index d43c76f47..94cc38571 100644
--- a/Samples/AppContentSearch/cs-winui/Notes.csproj
+++ b/Samples/AppContentSearch/cs-winui/Notes.csproj
@@ -29,11 +29,6 @@
 		<Content Remove="Assets\mockText.txt" />
 	</ItemGroup>
 
-	<!-- <ItemGroup>
-		<ProjectReference Include="..\..\product\APIs\Projection\Microsoft.Windows.AI.Search.Projection\Microsoft.Windows.AI.Search.Projection.csproj" />
-		<ProjectReference Include="..\..\product\APIs\Projection\Microsoft.Windows.AI.Text.Projection\Microsoft.Windows.AI.Text.Projection.csproj" />
-	</ItemGroup> -->
-
 	<ItemGroup>
 		<None Remove="Assets\Notes.ico" />
 		<None Remove="Controls\AttachmentView.xaml" />
@@ -41,10 +36,6 @@
 		<None Remove="Controls\SearchView.xaml" />
 	</ItemGroup>
 
-	<!-- <ItemGroup>
-		<AdditionalFiles Include="NativeMethods.txt" />
-	</ItemGroup> -->
-
 	<ItemGroup>
 		<Content Include="Assets\SplashScreen.scale-200.png" />
 		<Content Include="Assets\LockScreenLogo.scale-200.png" />
@@ -70,13 +61,12 @@
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
 		<PackageReference Include="Microsoft.AI.Foundry.Local" Version="0.3.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
 		<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25114.11" />
 		<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-experimental3" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.0.0-preview1" />
 		<PackageReference Include="OpenAI" Version="2.2.0-beta.2" />
 	</ItemGroup>
 	<ItemGroup>
@@ -119,30 +109,6 @@
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
 	</ItemGroup>
-	<!-- <ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Compile Remove="C:\.tools\.nuget\packages\microsoft.windowsappsdk.packages\1.8.250515001-experimental2\buildTransitive\..\include\WindowsAppSDK-VersionInfo.cs" />
-	</ItemGroup> -->
 	<ItemGroup>
 	  <PRIResource Remove="Assets\Icon\**" />
 	</ItemGroup>
diff --git a/Samples/AppContentSearch/cs-winui/Package.appxmanifest b/Samples/AppContentSearch/cs-winui/Package.appxmanifest
index c740d6551..32dd743b4 100644
--- a/Samples/AppContentSearch/cs-winui/Package.appxmanifest
+++ b/Samples/AppContentSearch/cs-winui/Package.appxmanifest
@@ -5,19 +5,17 @@
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10"
-  IgnorableNamespaces="uap rescap systemai">
-
+  IgnorableNamespaces="uap rescap systemai"
+  xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10">
+  
   <Identity
-    Name="8e8c755b-914d-4f6c-89b6-95af1fc4fbaa"
-    Publisher="CN=nikol"
-    Version="1.0.1.0" />
-
-  <mp:PhoneIdentity PhoneProductId="8e8c755b-914d-4f6c-89b6-95af1fc4fbaa" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+    Name="ai-powered-notes-winui3-sample"
+    Publisher="CN=AppContentSearchSample"
+    Version="1.0.0.0" />
 
   <Properties>
     <DisplayName>Notes</DisplayName>
-    <PublisherDisplayName>nikol</PublisherDisplayName>
+    <PublisherDisplayName>AppContentSearchSample</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
 
diff --git a/Samples/AppContentSearch/cs-winui/Pages/SettingsPage.xaml b/Samples/AppContentSearch/cs-winui/Pages/SettingsPage.xaml
index 073d35a48..b543d5746 100644
--- a/Samples/AppContentSearch/cs-winui/Pages/SettingsPage.xaml
+++ b/Samples/AppContentSearch/cs-winui/Pages/SettingsPage.xaml
@@ -2,8 +2,7 @@
     x:Class="Notes.Pages.SettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Notes.Pages"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls">
+    xmlns:local="using:Notes.Pages">
 
     <Page.Resources>
         <x:Double x:Key="SettingsCardSpacing">4</x:Double>
@@ -29,27 +28,35 @@
 
                     <!-- Language Model Settings Expander -->
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Language Models" />
-                    <toolkit:SettingsExpander x:Name="ModelSourceExpander" Header="ModelSource">
-                        <ComboBox SelectionChanged="ModelSource_SelectionChanged">
-                            <ComboBoxItem x:Name="PhiSilicaComboBoxItem" Content="Windows AI APIs LanguageModel (Phi Silica)" IsSelected="True"/>
-                            <ComboBoxItem x:Name="AzureComboBoxItem" Content="Azure OpenAI"/>
-                            <ComboBoxItem x:Name="FoundryComboBoxItem" Content="Foundry Local"/>
-                        </ComboBox>
+                    <Expander x:Name="ModelSourceExpander" Header="Model Source">
+                        <StackPanel Padding="12,8,12,12" Spacing="12">
+                            <ComboBox SelectionChanged="ModelSource_SelectionChanged">
+                                <ComboBoxItem x:Name="PhiSilicaComboBoxItem" Content="Windows AI APIs LanguageModel (Phi Silica)" IsSelected="True"/>
+                                <ComboBoxItem x:Name="AzureComboBoxItem" Content="Azure OpenAI"/>
+                                <ComboBoxItem x:Name="FoundryComboBoxItem" Content="Foundry Local"/>
+                            </ComboBox>
 
-                        <toolkit:SettingsExpander.Items>
                             <!-- Azure Settings Card -->
-                            <toolkit:SettingsCard x:Name="AzureSettingsCard" Header="AzureSettings" Visibility="Collapsed" HorizontalContentAlignment="Left" ContentAlignment="Left">
-                                <StackPanel Margin="-42,-24,0,12" Spacing="8">
+                            <Border x:Name="AzureSettingsCard"
+                                    Padding="16"
+                                    BorderThickness="1"
+                                    CornerRadius="8"
+                                    Visibility="Collapsed">
+                                <StackPanel Spacing="8">
                                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Azure Settings" />
                                     <PasswordBox x:Name="AzureApiKeyPasswordBox" Header="API Key" PlaceholderText="Enter your API key" />
                                     <TextBox x:Name="AzureEndpointUriTextBox" Header="Endpoint URI" PlaceholderText="https://YOUR_RESOURCE_NAME.openai.azure.com/" />
                                     <TextBox x:Name="AzureDeploymentNameTextBox" Header="Model Deployment Name:" PlaceholderText="e.g. gpt-4o" />
                                 </StackPanel>
-                            </toolkit:SettingsCard>
+                            </Border>
 
                             <!-- Foundry Settings Card -->
-                            <toolkit:SettingsCard x:Name="FoundrySettingsCard" Visibility="Collapsed" HorizontalContentAlignment="Left" ContentAlignment="Left">
-                                <StackPanel Margin="-42,-24,0,12" Spacing="8">
+                            <Border x:Name="FoundrySettingsCard"
+                                    Padding="16"
+                                    BorderThickness="1"
+                                    CornerRadius="8"
+                                    Visibility="Collapsed">
+                                <StackPanel Spacing="8">
                                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Foundry Settings" />
                                     <ComboBox x:Name="FoundryModelComboBox" Header="AI Foundry Model" PlaceholderText="Select a model" Width="260"/>
 
@@ -84,24 +91,28 @@
                                         </ListView.ItemTemplate>
                                     </ListView>
                                 </StackPanel>
-                            </toolkit:SettingsCard>
-                        </toolkit:SettingsExpander.Items>
-                    </toolkit:SettingsExpander>
+                            </Border>
+                        </StackPanel>
+                    </Expander>
 
                     <!-- Image / Bounding Box Settings Expander -->
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Image Overlays" />
-                    <toolkit:SettingsCard Header="Image Result Overlays" Description="Show bounding boxes on image search results">
-                        <StackPanel Padding="0" Spacing="12">
+                    <Border Padding="16"
+                            BorderThickness="1"
+                            CornerRadius="8">
+                        <StackPanel Spacing="12">
+                            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="Image Result Overlays" />
+                            <TextBlock Text="Show bounding boxes on image search results" TextWrapping="WrapWholeWords" />
                             <ToggleSwitch
                                  x:Name="ShowBoundingBoxesToggleSwitch"
                                  OffContent="Off"
-                                 OnContent="On"/>
+                                  OnContent="On"/>
                         </StackPanel>
-                    </toolkit:SettingsCard>
+                    </Border>
 
                     <Button x:Name="SaveButton" Content="Save" Margin="0,16,0,0" Click="SaveButton_Click" Width="120" Style="{StaticResource AccentButtonStyle}" HorizontalAlignment="Left" IsEnabled="False"/>
                 </StackPanel>
             </Grid>
         </ScrollViewer>
     </Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/Samples/AppContentSearch/cs-winui/Utils/AttachmentProcessor.cs b/Samples/AppContentSearch/cs-winui/Utils/AttachmentProcessor.cs
index 8507720fd..b85afe74e 100644
--- a/Samples/AppContentSearch/cs-winui/Utils/AttachmentProcessor.cs
+++ b/Samples/AppContentSearch/cs-winui/Utils/AttachmentProcessor.cs
@@ -1,11 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
-using Notes.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Microsoft.Windows.Search.AppContentIndex;
+using Notes.Models;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
@@ -14,7 +14,7 @@ namespace Notes
 {
     public static class AttachmentProcessor
     {
-        public static EventHandler<AttachmentProcessedEventArgs>? AttachmentProcessed;
+        internal static EventHandler<AttachmentProcessedEventArgs>? AttachmentProcessed;
 
         private readonly static List<Attachment> _toBeProcessed = new();
         private static bool _isProcessing = false;
@@ -46,7 +46,7 @@ public async static Task RemoveAttachment(Attachment attachment)
             {
                 await Task.Run(() =>
                 {
-                    MainWindow.AppContentIndexer.Remove(attachment.Id.ToString());
+                    MainWindow.AppContentIndexer.RemoveContentItem(attachment.Id.ToString());
                 });
                 Debug.WriteLine($"Deleted image from index: {attachment.Filename}");
             }
diff --git a/Samples/AppContentSearch/cs-winui/Utils/Utils.cs b/Samples/AppContentSearch/cs-winui/Utils/Utils.cs
index f295a47fa..639030fdd 100644
--- a/Samples/AppContentSearch/cs-winui/Utils/Utils.cs
+++ b/Samples/AppContentSearch/cs-winui/Utils/Utils.cs
@@ -1,12 +1,13 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
-using Notes.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Windows.Search.AppContentIndex;
+using Notes.ViewModels;
 using Windows.Foundation;
 using Windows.Storage;
 
@@ -56,19 +57,15 @@ public static async Task<StorageFolder> GetAttachmentsTranscriptsFolderAsync()
 
         public static async Task<List<SearchResult>> SearchAsync(AppContentIndexer appContentIndexer, string searchText, int top = 5, CancellationToken cancellationToken = default)
         {
-            var results = new List<SearchResult>();
-
             if (string.IsNullOrWhiteSpace(searchText) || appContentIndexer == null)
             {
-                return results;
+                return new List<SearchResult>();
             }
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var context = await AppDataContext.GetCurrentAsync();
-
-            IEnumerable<AppIndexQueryMatch>? textMatches = null;
-            IEnumerable<AppIndexQueryMatch>? imageMatches = null;
+            IEnumerable<TextQueryMatch>? textMatches = null;
+            IEnumerable<ImageQueryMatch>? imageMatches = null;
             await Task.Run(() =>
             {
                 cancellationToken.ThrowIfCancellationRequested();
@@ -78,6 +75,14 @@ await Task.Run(() =>
                 imageMatches = imageQuery.GetNextMatches(top);
             }, cancellationToken);
 
+            return await SearchMatchesAsync(textMatches, imageMatches, cancellationToken);
+        }
+
+        public static async Task<List<SearchResult>> SearchMatchesAsync(IEnumerable<TextQueryMatch>? textMatches, IEnumerable<ImageQueryMatch>? imageMatches, CancellationToken cancellationToken = default)
+        {
+            var results = new List<SearchResult>();
+            var context = await AppDataContext.GetCurrentAsync();
+
             cancellationToken.ThrowIfCancellationRequested();
 
             if (textMatches != null)
@@ -86,46 +91,59 @@ await Task.Run(() =>
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    int matchcontentId = int.Parse(match.ContentId);
-                    var note = await context.Notes.FindAsync(matchcontentId);
-
-                    if (note != null && note.Filename != null)
+                    SearchResult? ocrResult = await TryCreateOcrSearchResultAsync(match, context, cancellationToken);
+                    if (ocrResult != null)
                     {
-                        Debug.WriteLine($"Text match: {note.Filename}");
+                        results.Add(ocrResult);
+                        continue;
+                    }
 
-                        AppManagedTextQueryMatch? textMatch = match as AppManagedTextQueryMatch;
+                    if (match is AppManagedTextQueryMatch textMatch)
+                    {
+                        if (!int.TryParse(match.ContentId, out int noteId))
+                        {
+                            Debug.WriteLine($"Skipping text match with non-integer content ID: {match.ContentId}");
+                            continue;
+                        }
 
-                        if (textMatch != null)
+                        var note = await context.Notes.FindAsync(noteId);
+                        if (note == null || note.Filename == null)
                         {
-                            string matchingData = await NoteViewModel.LoadTextContentByIdAsync(note.Filename);
+                            continue;
+                        }
 
-                            int textOffset = Math.Max(0, Math.Min(textMatch.TextOffset, matchingData.Length));
-                            int remainingLength = matchingData.Length - textOffset;
+                        Debug.WriteLine($"Text match: {note.Filename}");
 
-                            if (remainingLength > 0)
-                            {
-                                int substringLength = Math.Min(500, remainingLength);
-                                string matchingString = matchingData.Substring(textOffset, substringLength);
-                                var attachmentsFolder = await GetAttachmentsFolderAsync();
-                                var searchResult = new SearchResult
-                                {
-                                    Content = matchingString,
-                                    ContentType = ContentType.Note,
-                                    ContentSubType = ContentSubType.None,
-                                    SourceId = note.Id,
-                                    Title = note.Title,
-                                    MostRelevantSentence = matchingString,
-                                    Path = attachmentsFolder.Path + "\\" + note.Filename
-                                };
-
-                                results.Add(searchResult);
-                            }
-                            else
-                            {
-                                Debug.WriteLine($"Skipping match with invalid TextOffset: {textMatch.TextOffset} for content length: {matchingData.Length}");
-                            }
+                        string matchingData = await NoteViewModel.LoadTextContentByIdAsync(note.Filename);
+
+                        int textOffset = Math.Max(0, Math.Min(textMatch.TextOffset, matchingData.Length));
+                        int remainingLength = matchingData.Length - textOffset;
+
+                        if (remainingLength <= 0)
+                        {
+                            Debug.WriteLine($"Skipping match with invalid TextOffset: {textMatch.TextOffset} for content length: {matchingData.Length}");
+                            continue;
                         }
+
+                        int substringLength = Math.Min(500, remainingLength);
+                        string matchingString = matchingData.Substring(textOffset, substringLength);
+                        var notesFolder = await GetLocalFolderAsync();
+                        var textResult = new SearchResult
+                        {
+                            Content = matchingString,
+                            ContentType = ContentType.Note,
+                            ContentSubType = ContentSubType.None,
+                            SourceId = note.Id,
+                            Title = note.Title,
+                            MostRelevantSentence = matchingString,
+                            Path = notesFolder.Path + "\\" + note.Filename
+                        };
+
+                        results.Add(textResult);
+                        continue;
                     }
+
+                    Debug.WriteLine($"Skipping unsupported text match type: {match.GetType().Name}");
                 }
             }
             else
@@ -141,7 +159,12 @@ await Task.Run(() =>
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    int matchContentId = int.Parse(match.ContentId);
+                    if (!int.TryParse(match.ContentId, out int matchContentId))
+                    {
+                        Debug.WriteLine($"Skipping image match with non-integer content ID: {match.ContentId}");
+                        continue;
+                    }
+
                     var image = await context.Attachments.FindAsync(matchContentId);
 
                     if (image != null)
@@ -149,7 +172,7 @@ await Task.Run(() =>
                         AppManagedImageQueryMatch? imageMatch = match as AppManagedImageQueryMatch;
                         if (imageMatch != null)
                         {
-                            Debug.WriteLine($"Image match: {imageMatch.ContentId}, Subregion: {imageMatch.Subregion}");
+                            Debug.WriteLine($"Image match: {imageMatch.ContentId}, Region of interest: {imageMatch.RegionOfInterest}");
                             var searchResult = new SearchResult
                             {
                                 ContentType = ContentType.Image,
@@ -184,18 +207,18 @@ await Task.Run(() =>
                             var attachmentsFolder = await GetAttachmentsFolderAsync();
                             searchResult.Path = attachmentsFolder.Path + "\\" + image.RelativePath;
 
-                            // Capture bounding box if present (Subregion is IReference<Rect>)
+                            // Capture bounding box if present (Region of interest is IReference<Rect>)
                             try
                             {
-                                if (imageMatch.Subregion != null)
+                                if (imageMatch.RegionOfInterest != null)
                                 {
-                                    var rect = imageMatch.Subregion.Value;
+                                    var rect = imageMatch.RegionOfInterest.Value;
                                     searchResult.BoundingBox = rect;
                                 }
                             }
                             catch (Exception ex)
                             {
-                                Debug.WriteLine("Failed to read image Subregion: " + ex.Message);
+                                Debug.WriteLine("Failed to read image Region of interest: " + ex.Message);
                             }
                             results.Add(searchResult);
                         }
@@ -206,8 +229,71 @@ await Task.Run(() =>
             {
                 Debug.WriteLine("ImageMatches is null");
             }
+
             return results;
         }
+
+        private static async Task<SearchResult?> TryCreateOcrSearchResultAsync(TextQueryMatch match, AppDataContext context, CancellationToken cancellationToken)
+        {
+            if (!string.Equals(match.GetType().Name, "AppManagedOcrTextQueryMatch", StringComparison.Ordinal))
+            {
+                return null;
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (!int.TryParse(match.ContentId, out int attachmentId))
+            {
+                Debug.WriteLine($"Skipping OCR match with non-integer content ID: {match.ContentId}");
+                return null;
+            }
+
+            var attachment = await context.Attachments.FindAsync(attachmentId);
+            if (attachment == null)
+            {
+                Debug.WriteLine($"Skipping OCR match; attachment not found for content ID: {attachmentId}");
+                return null;
+            }
+
+            var note = await context.Notes.FindAsync(attachment.NoteId);
+            if (note == null)
+            {
+                Debug.WriteLine($"Skipping OCR match; note not found for attachment ID: {attachmentId}");
+                return null;
+            }
+
+            string fragment = match.GetType().GetProperty("Fragment")?.GetValue(match) as string ?? string.Empty;
+            Rect? subregion = GetMatchSubregion(match);
+            Debug.WriteLine($"OCR text match: contentId={match.ContentId}, fragment='{fragment}', Subregion={subregion}");
+
+            var attachmentsFolder = await GetAttachmentsFolderAsync();
+            return new SearchResult
+            {
+                Content = fragment,
+                ContentType = ContentType.OcrText,
+                ContentSubType = ContentSubType.None,
+                SourceId = note.Id,
+                AttachmentId = attachment.Id,
+                Title = note.Title + " (OCR)",
+                MostRelevantSentence = fragment,
+                Path = attachmentsFolder.Path + "\\" + attachment.RelativePath,
+                BoundingBox = subregion
+            };
+        }
+
+        private static Rect? GetMatchSubregion(TextQueryMatch match)
+        {
+            try
+            {
+                object? subregion = match.GetType().GetProperty("Subregion")?.GetValue(match);
+                return subregion is Rect rect ? rect : null;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine("Failed to read OCR Subregion: " + ex.Message);
+                return null;
+            }
+        }
     }
 
     public record SearchResult
@@ -218,6 +304,7 @@ public record SearchResult
         public string? MostRelevantSentence { get; set; }
         public string? Path { get; set; }
         public int SourceId { get; set; }
+        public int? AttachmentId { get; set; }
         public ContentType ContentType { get; set; }
         public ContentSubType ContentSubType { get; set; }
         public Rect? BoundingBox { get; set; }
@@ -231,6 +318,7 @@ public static string ContentTypeToGlyph(ContentType type)
                 ContentType.Audio => "🎙️",
                 ContentType.Video => "🎞️",
                 ContentType.Document => "📄",
+                ContentType.OcrText => "🔍",
                 _ => throw new NotImplementedException()
             };
         }
@@ -256,6 +344,7 @@ public enum ContentType
         Video = 2,
         Document = 3,
         Note = 4,
+        OcrText = 5,
     }
 
     public enum ContentSubType
@@ -266,4 +355,4 @@ public enum ContentSubType
         Gif = 3,
         Bmp = 4
     }
-}
\ No newline at end of file
+}
diff --git a/Samples/AppContentSearch/cs-winui/ViewModels/NoteViewModel.cs b/Samples/AppContentSearch/cs-winui/ViewModels/NoteViewModel.cs
index 4a0e4caaf..04dfd7fe5 100644
--- a/Samples/AppContentSearch/cs-winui/ViewModels/NoteViewModel.cs
+++ b/Samples/AppContentSearch/cs-winui/ViewModels/NoteViewModel.cs
@@ -1,15 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml;
-using Microsoft.Windows.AI.Search.Experimental.AppContentIndex;
-using Notes.Models;
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.Windows.Search.AppContentIndex;
+using Notes.Models;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
 
@@ -220,7 +220,7 @@ public async Task RemoveNoteFromIndexAsync()
             {
                 await Task.Run(() =>
                 {
-                    MainWindow.AppContentIndexer.Remove(Note.Id.ToString());
+                    MainWindow.AppContentIndexer.RemoveContentItem(Note.Id.ToString());
                 });
                 Debug.WriteLine($"Deleted note from index: {Note.Filename}");
             }
@@ -247,7 +247,7 @@ public async static Task ManualDeleteIndex()
             {
                 await Task.Run(() =>
                 {
-                    MainWindow.AppContentIndexer.RemoveAll();
+                    MainWindow.AppContentIndexer.RemoveAllContentItems();
                 });
                 Debug.WriteLine($"Deleted Index");
             }
@@ -327,7 +327,7 @@ private async Task SaveContentToFileDeleteAndReIndex()
 
                 await Task.Run(() =>
                 {
-                    MainWindow.AppContentIndexer.Remove(Note.Id.ToString());
+                    MainWindow.AppContentIndexer.RemoveContentItem(Note.Id.ToString());
                 });
                 Debug.WriteLine($"Deleted note {Note.Title}");
 
diff --git a/Samples/AppContentSearch/cs-winui/ViewModels/SearchViewModel.cs b/Samples/AppContentSearch/cs-winui/ViewModels/SearchViewModel.cs
index 22bc9ebac..19b135646 100644
--- a/Samples/AppContentSearch/cs-winui/ViewModels/SearchViewModel.cs
+++ b/Samples/AppContentSearch/cs-winui/ViewModels/SearchViewModel.cs
@@ -1,17 +1,22 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.UI.Xaml;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Dispatching;
+using Microsoft.Windows.Search.AppContentIndex;
 
 namespace Notes.ViewModels
 {
-    public partial class SearchViewModel : ObservableObject
+    public partial class SearchViewModel : ObservableObject, IDisposable
     {
+        private const int MaxVisibleMatches = 5;
+
         [ObservableProperty]
         public bool showResults = false;
 
@@ -23,47 +28,128 @@ public partial class SearchViewModel : ObservableObject
 
         [ObservableProperty]
         public bool showTextResults = false;
+
+        [ObservableProperty]
+        public bool showOcrResults = false;
+
         public ObservableCollection<SearchResult> TextResults { get; set; } = new();
         public ObservableCollection<SearchResult> ImageResults { get; set; } = new();
+        public ObservableCollection<SearchResult> OcrResults { get; set; } = new();
 
         private string _searchText = string.Empty;
         private CancellationTokenSource? _currentSearchCancellation;
+        private AppIndexTextQuerySession? _textQuerySession;
+        private AppIndexImageQuerySession? _imageQuerySession;
+        private DispatcherQueue? _dispatcherQueue;
+        private bool _isDisposed;
 
         public SearchViewModel()
         {
         }
-        public async void HandleQuerySubmitted(string text)
+
+        public void HandleQuerySubmitted(string text)
         {
             _searchText = text;
-            await Search();
+            StartSearch();
+        }
+
+        public void HandleTextChanged(string text)
+        {
+            _searchText = text;
+            StartSearch();
+        }
+
+        public void InitializeQuerySessions(AppContentIndexer appContentIndexer, DispatcherQueue dispatcherQueue)
+        {
+            if (_isDisposed || _textQuerySession != null || _imageQuerySession != null)
+            {
+                return;
+            }
+
+            _dispatcherQueue = dispatcherQueue;
+
+            _textQuerySession = appContentIndexer.CreateTextQuerySession();
+            _textQuerySession.DesiredMatchesPerResult = MaxVisibleMatches;
+            _textQuerySession.ResultChanged += TextQuerySession_ResultChanged;
+            _textQuerySession.Start();
+
+            _imageQuerySession = appContentIndexer.CreateImageQuerySession();
+            _imageQuerySession.DesiredMatchesPerResult = MaxVisibleMatches;
+            _imageQuerySession.ResultChanged += ImageQuerySession_ResultChanged;
+            _imageQuerySession.Start();
+
+            if (!string.IsNullOrWhiteSpace(_searchText))
+            {
+                UpdateQuerySessions(_searchText);
+            }
         }
 
         public void Reset()
         {
             TextResults.Clear();
             ImageResults.Clear();
+            OcrResults.Clear();
             ShowResults = false;
             ShowNoResults = false;
             ShowImageResults = false;
             ShowTextResults = false;
+            ShowOcrResults = false;
         }
 
-        private async Task Search()
+        private void StartSearch()
+        {
+            if (_isDisposed)
+            {
+                return;
+            }
+
+            if (_textQuerySession != null && _imageQuerySession != null)
+            {
+                UpdateQuerySessions(_searchText);
+                return;
+            }
+
+            _ = SearchAsync();
+        }
+
+        private void UpdateQuerySessions(string text)
+        {
+            CancelCurrentSearch();
+            Reset();
+
+            if (_textQuerySession is null || _imageQuerySession is null)
+            {
+                return;
+            }
+
+            _textQuerySession.UpdateQueryPhrase(text ?? string.Empty);
+            _imageQuerySession.UpdateQueryPhrase(text ?? string.Empty);
+        }
+
+        private CancellationToken BeginCurrentSearch()
+        {
+            CancelCurrentSearch();
+            _currentSearchCancellation = new CancellationTokenSource();
+            return _currentSearchCancellation.Token;
+        }
+
+        private void CancelCurrentSearch()
         {
-            Debug.WriteLine("searching");
-            
-            // Cancel any existing search
             _currentSearchCancellation?.Cancel();
             _currentSearchCancellation?.Dispose();
-            
-            // Create new cancellation token for this search
-            _currentSearchCancellation = new CancellationTokenSource();
-            var cancellationToken = _currentSearchCancellation.Token;
-            
+            _currentSearchCancellation = null;
+        }
+
+        private async Task SearchAsync()
+        {
+            Debug.WriteLine("searching");
+            string searchText = _searchText;
+            CancellationToken cancellationToken = BeginCurrentSearch();
+
             try
             {
                 Reset();
-                if (string.IsNullOrWhiteSpace(_searchText))
+                if (string.IsNullOrWhiteSpace(searchText))
                 {
                     return;
                 }
@@ -74,54 +160,172 @@ private async Task Search()
                     return;
                 }
 
-                var results = await Utils.SearchAsync(MainWindow.AppContentIndexer, _searchText, cancellationToken: cancellationToken);
+                var results = await Utils.SearchAsync(
+                    MainWindow.AppContentIndexer,
+                    searchText,
+                    top: MaxVisibleMatches,
+                    cancellationToken: cancellationToken);
 
                 // Check if we were cancelled before updating UI
-                if (cancellationToken.IsCancellationRequested)
+                if (cancellationToken.IsCancellationRequested ||
+                    !string.Equals(searchText, _searchText, StringComparison.Ordinal))
                 {
                     Debug.WriteLine("Search was cancelled, not updating results");
                     return;
                 }
 
-                foreach (var result in results)
+                ApplySearchResults(results, showNoResultsWhenEmpty: true);
+            }
+            catch (OperationCanceledException)
+            {
+                Debug.WriteLine("Search operation was cancelled");
+                // Don't update UI when cancelled - let the new search handle it
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Search failed: {ex.Message}");
+                // Handle other exceptions as needed
+            }
+        }
+
+        private void TextQuerySession_ResultChanged(AppIndexTextQuerySession sender, object args)
+        {
+            _ = RefreshQuerySessionResultsAsync();
+        }
+
+        private void ImageQuerySession_ResultChanged(AppIndexImageQuerySession sender, object args)
+        {
+            _ = RefreshQuerySessionResultsAsync();
+        }
+
+        private async Task RefreshQuerySessionResultsAsync()
+        {
+            if (_isDisposed || _dispatcherQueue is null || _textQuerySession is null || _imageQuerySession is null)
+            {
+                return;
+            }
+
+            string searchText = _searchText;
+            if (string.IsNullOrWhiteSpace(searchText))
+            {
+                return;
+            }
+
+            try
+            {
+                List<TextQueryMatch>? textMatches = null;
+                List<ImageQueryMatch>? imageMatches = null;
+
+                TextQuerySessionResult textResult = _textQuerySession.GetResult();
+                bool hasValidTextResult =
+                    textResult.IsValid &&
+                    string.Equals(textResult.QueryPhrase, searchText, StringComparison.Ordinal);
+                if (hasValidTextResult)
                 {
-                    if (result.ContentType == ContentType.Image)
-                    {
-                        ImageResults.Add(result);
-                    }
-                    else if (result.ContentType == ContentType.Note)
-                    {
-                        TextResults.Add(result);
-                    }
+                    textMatches = textResult.Matches.Take(MaxVisibleMatches).ToList();
                 }
 
-                if (ImageResults.Count > 0)
+                ImageQuerySessionResult imageResult = _imageQuerySession.GetResult();
+                bool hasValidImageResult =
+                    imageResult.IsValid &&
+                    string.Equals(imageResult.QueryPhrase, searchText, StringComparison.Ordinal);
+                if (hasValidImageResult)
                 {
-                    ShowImageResults = true;
+                    imageMatches = imageResult.Matches.Take(MaxVisibleMatches).ToList();
                 }
 
-                if (TextResults.Count > 0)
+                if (!hasValidTextResult && !hasValidImageResult)
                 {
-                    ShowTextResults = true;
+                    return;
                 }
 
-                if (!ShowImageResults && !ShowTextResults)
+                CancellationToken cancellationToken = BeginCurrentSearch();
+                var results = await Utils.SearchMatchesAsync(textMatches, imageMatches, cancellationToken);
+
+                if (_isDisposed ||
+                    cancellationToken.IsCancellationRequested ||
+                    !string.Equals(searchText, _searchText, StringComparison.Ordinal))
                 {
-                    ShowNoResults = true;
+                    return;
                 }
 
-                ShowResults = true;
+                bool showNoResultsWhenEmpty = hasValidTextResult && hasValidImageResult;
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    if (_isDisposed ||
+                        cancellationToken.IsCancellationRequested ||
+                        !string.Equals(searchText, _searchText, StringComparison.Ordinal))
+                    {
+                        return;
+                    }
+
+                    ApplySearchResults(results, showNoResultsWhenEmpty);
+                });
             }
             catch (OperationCanceledException)
             {
-                Debug.WriteLine("Search operation was cancelled");
-                // Don't update UI when cancelled - let the new search handle it
+                Debug.WriteLine("Interactive search update was cancelled");
             }
             catch (Exception ex)
             {
-                Debug.WriteLine($"Search failed: {ex.Message}");
-                // Handle other exceptions as needed
+                Debug.WriteLine($"Interactive search failed: {ex.Message}");
+            }
+        }
+
+        private void ApplySearchResults(IEnumerable<SearchResult> results, bool showNoResultsWhenEmpty)
+        {
+            Reset();
+
+            foreach (var result in results)
+            {
+                if (result.ContentType == ContentType.Image)
+                {
+                    ImageResults.Add(result);
+                }
+                else if (result.ContentType == ContentType.Note)
+                {
+                    TextResults.Add(result);
+                }
+                else if (result.ContentType == ContentType.OcrText)
+                {
+                    OcrResults.Add(result);
+                }
             }
+
+            ShowImageResults = ImageResults.Count > 0;
+            ShowTextResults = TextResults.Count > 0;
+            ShowOcrResults = OcrResults.Count > 0;
+
+            bool hasResults = ShowImageResults || ShowTextResults || ShowOcrResults;
+            ShowNoResults = !hasResults && showNoResultsWhenEmpty;
+            ShowResults = hasResults || ShowNoResults;
+        }
+
+        public void Dispose()
+        {
+            if (_isDisposed)
+            {
+                return;
+            }
+
+            _isDisposed = true;
+            CancelCurrentSearch();
+
+            if (_textQuerySession != null)
+            {
+                _textQuerySession.ResultChanged -= TextQuerySession_ResultChanged;
+                _textQuerySession.Dispose();
+                _textQuerySession = null;
+            }
+
+            if (_imageQuerySession != null)
+            {
+                _imageQuerySession.ResultChanged -= ImageQuerySession_ResultChanged;
+                _imageQuerySession.Dispose();
+                _imageQuerySession = null;
+            }
+
+            _dispatcherQueue = null;
         }
     }
 }