diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 0000000..8eddc00
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,65 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+
+language: "en-US"
+early_access: false
+enable_free_tier: true
+
+reviews:
+  profile: "chill"
+  high_level_summary: true
+  review_status: true
+  commit_status: true
+  collapse_walkthrough: true
+  sequence_diagrams: false
+  poem: false
+
+  path_filters:
+    - "!**/*.Designer.cs"
+    - "!**/bin/**"
+    - "!**/obj/**"
+    - "!**/publish/**"
+    - "!**/*.user"
+    - "!**/*.suo"
+    - "!**/screenshots/**"
+
+  path_instructions:
+    - path: "src/PlanViewer.App/**/*.cs"
+      instructions: >
+        Avalonia 11.3 desktop app using code-behind pattern (not MVVM).
+        Watch for: null reference risks, proper disposal of resources,
+        async/await patterns, and Avalonia-specific UI threading.
+    - path: "src/PlanViewer.Core/**/*.cs"
+      instructions: >
+        Core library with execution plan analysis (PlanAnalyzer), XML parsing,
+        and shared services. Watch for: XML parsing safety, null handling,
+        and performance with large execution plans.
+    - path: "src/PlanViewer.Mcp/**/*.cs"
+      instructions: >
+        MCP (Model Context Protocol) server integration for AI tools.
+        Watch for: input validation, proper error responses, and serialization safety.
+    - path: "tests/**/*.cs"
+      instructions: >
+        Unit and integration tests. Watch for: test isolation,
+        meaningful assertions, and proper test data setup.
+
+  auto_review:
+    enabled: true
+    drafts: false
+    base_branches:
+      - "dev"
+      - "main"
+
+  tools:
+    gitleaks:
+      enabled: true
+    github-checks:
+      enabled: true
+
+chat:
+  auto_reply: true
+
+knowledge_base:
+  learnings:
+    scope: "local"
+  pull_requests:
+    scope: "local"
diff --git a/README.md b/README.md
index aff80fe..e5a3b71 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,14 @@ Pre-built binaries are available on the [Releases](https://github.com/erikdarlin
 
 These are self-contained — no .NET SDK required. Extract the zip and run.
 
+**macOS note:** macOS may block the app because it isn't signed with an Apple Developer certificate. If you see a warning that the app "can't be opened," run this after extracting:
+
+```bash
+xattr -cr PerformanceStudio.app
+```
+
+Then open the app normally.
+
 ## Build from Source
 
 Clone and build:
diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
index 363d967..6851fdb 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
@@ -90,8 +90,6 @@ public partial class PlanViewerControl : UserControl
     private static readonly SolidColorBrush OrangeBrush = new(Colors.Orange);
 
 
-    // Current property section for collapsible groups
-    private StackPanel? _currentPropertySection;
     // Track all property section grids for synchronized column resize
     private readonly List<ColumnDefinition> _sectionLabelColumns = new();
     private double _propertyLabelWidth = 140;
@@ -118,7 +116,8 @@ public partial class PlanViewerControl : UserControl
     public PlanViewerControl()
     {
         InitializeComponent();
-        PlanScrollViewer.PointerWheelChanged += PlanScrollViewer_PointerWheelChanged;
+        // Use Tunnel routing so Ctrl+wheel zoom fires before ScrollViewer consumes the event
+        PlanScrollViewer.AddHandler(PointerWheelChangedEvent, PlanScrollViewer_PointerWheelChanged, Avalonia.Interactivity.RoutingStrategies.Tunnel);
         // Use Tunnel routing so pan handlers fire before ScrollViewer consumes the events
         PlanScrollViewer.AddHandler(PointerPressedEvent, PlanScrollViewer_PointerPressed, Avalonia.Interactivity.RoutingStrategies.Tunnel);
         PlanScrollViewer.AddHandler(PointerMovedEvent, PlanScrollViewer_PointerMoved, Avalonia.Interactivity.RoutingStrategies.Tunnel);
@@ -820,7 +819,6 @@ private async System.Threading.Tasks.Task SetClipboardTextAsync(string text)
     private void ShowPropertiesPanel(PlanNode node)
     {
         PropertiesContent.Children.Clear();
-        _currentPropertySection = null;
         _sectionLabelColumns.Clear();
         _currentSectionGrid = null;
         _currentSectionRowIndex = 0;
@@ -1771,7 +1769,6 @@ private void AddPropertySection(string title)
             HorizontalContentAlignment = HorizontalAlignment.Stretch
         };
         PropertiesContent.Children.Add(expander);
-        _currentPropertySection = null; // No longer used — rows go into _currentSectionGrid
     }
 
     private void AddPropertyRow(string label, string value, bool isCode = false, bool indent = false)
@@ -2187,7 +2184,7 @@ private void ShowParameters(PlanStatement statement)
 
         if (parameters.Count == 0)
         {
-            var localVars = FindUnresolvedVariables(statement.StatementText, parameters);
+            var localVars = FindUnresolvedVariables(statement.StatementText, parameters, statement.RootNode);
             if (localVars.Count > 0)
             {
                 ParametersHeader.Text = "Parameters";
@@ -2303,7 +2300,7 @@ private void ShowParameters(PlanStatement statement)
             }
         }
 
-        var unresolved = FindUnresolvedVariables(statement.StatementText, parameters);
+        var unresolved = FindUnresolvedVariables(statement.StatementText, parameters, statement.RootNode);
         if (unresolved.Count > 0)
         {
             AddParameterAnnotation(
@@ -2350,7 +2347,8 @@ private void AddParameterAnnotation(string text, string color)
         });
     }
 
-    private static List<string> FindUnresolvedVariables(string queryText, List<PlanParameter> parameters)
+    private static List<string> FindUnresolvedVariables(string queryText, List<PlanParameter> parameters,
+        PlanNode? rootNode = null)
     {
         var unresolved = new List<string>();
         if (string.IsNullOrEmpty(queryText))
@@ -2359,6 +2357,11 @@ private static List<string> FindUnresolvedVariables(string queryText, List<PlanP
         var extractedNames = new HashSet<string>(
             parameters.Select(p => p.Name), StringComparer.OrdinalIgnoreCase);
 
+        // Collect table variable names from the plan tree so we don't misreport them as local variables
+        var tableVarNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        if (rootNode != null)
+            CollectTableVariableNames(rootNode, tableVarNames);
+
         var matches = Regex.Matches(queryText, @"@\w+", RegexOptions.IgnoreCase);
         var seenVars = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
@@ -2369,6 +2372,8 @@ private static List<string> FindUnresolvedVariables(string queryText, List<PlanP
                 continue;
             if (varName.StartsWith("@@", StringComparison.OrdinalIgnoreCase))
                 continue;
+            if (tableVarNames.Contains(varName))
+                continue;
 
             seenVars.Add(varName);
             unresolved.Add(varName);
@@ -2377,6 +2382,19 @@ private static List<string> FindUnresolvedVariables(string queryText, List<PlanP
         return unresolved;
     }
 
+    private static void CollectTableVariableNames(PlanNode node, HashSet<string> names)
+    {
+        if (!string.IsNullOrEmpty(node.ObjectName) && node.ObjectName.StartsWith("@"))
+        {
+            // ObjectName is like "@t.c" — extract the table variable name "@t"
+            var dotIdx = node.ObjectName.IndexOf('.');
+            var tvName = dotIdx > 0 ? node.ObjectName[..dotIdx] : node.ObjectName;
+            names.Add(tvName);
+        }
+        foreach (var child in node.Children)
+            CollectTableVariableNames(child, names);
+    }
+
     private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
     {
         warnings.AddRange(node.Warnings);
@@ -2961,9 +2979,17 @@ private async void SavePlan_Click(object? sender, RoutedEventArgs e)
 
         if (file != null)
         {
-            await using var stream = await file.OpenWriteAsync();
-            await using var writer = new StreamWriter(stream);
-            await writer.WriteAsync(_currentPlan.RawXml);
+            try
+            {
+                await using var stream = await file.OpenWriteAsync();
+                await using var writer = new StreamWriter(stream);
+                await writer.WriteAsync(_currentPlan.RawXml);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"SavePlan failed: {ex.Message}");
+                CostText.Text = $"Save failed: {(ex.Message.Length > 60 ? ex.Message[..60] + "..." : ex.Message)}";
+            }
         }
     }
 
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index fadeed6..76f6534 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -60,8 +60,8 @@ public QuerySessionControl(ICredentialService credentialService, ConnectionStore
         // Keybindings: F5/Ctrl+E for Execute, Ctrl+L for Estimated Plan
         KeyDown += OnKeyDown;
 
-        // Ctrl+mousewheel for font zoom
-        QueryEditor.PointerWheelChanged += OnEditorPointerWheel;
+        // Ctrl+mousewheel for font zoom — use Tunnel so it fires before ScrollViewer consumes scroll-down
+        QueryEditor.AddHandler(Avalonia.Input.InputElement.PointerWheelChangedEvent, OnEditorPointerWheel, Avalonia.Interactivity.RoutingStrategies.Tunnel);
 
         // Code completion
         QueryEditor.TextArea.TextEntering += OnTextEntering;
@@ -74,6 +74,8 @@ public QuerySessionControl(ICredentialService credentialService, ConnectionStore
             QueryEditor.TextArea.Focus();
         };
 
+        DetachedFromVisualTree += (_, _) => _textMateInstallation?.Dispose();
+
         // Focus the editor when the Editor tab is selected; toggle plan-dependent buttons
         SubTabControl.SelectionChanged += (_, _) =>
         {
@@ -320,6 +322,7 @@ private string GetTextFromCursor()
     private void SetStatus(string text, bool autoClear = true)
     {
         _statusClearCts?.Cancel();
+        _statusClearCts?.Dispose();
         StatusText.Text = text;
 
         if (autoClear && !string.IsNullOrEmpty(text))
@@ -335,44 +338,7 @@ private void SetStatus(string text, bool autoClear = true)
 
     private async void Connect_Click(object? sender, RoutedEventArgs e)
     {
-        var dialog = new ConnectionDialog(_credentialService, _connectionStore);
-        var result = await dialog.ShowDialog<bool?>(GetParentWindow());
-
-        if (result == true && dialog.ResultConnection != null)
-        {
-            _serverConnection = dialog.ResultConnection;
-            _selectedDatabase = dialog.ResultDatabase;
-            _connectionString = _serverConnection.GetConnectionString(_credentialService, _selectedDatabase);
-
-            ServerLabel.Text = _serverConnection.ServerName;
-            ServerLabel.Foreground = Brushes.LimeGreen;
-            ConnectButton.Content = "Reconnect";
-
-            // Populate database dropdown
-            await PopulateDatabases();
-
-            // Collect server metadata for advice output
-            await FetchServerMetadataAsync();
-
-            // Select the database chosen in the dialog
-            if (_selectedDatabase != null)
-            {
-                for (int i = 0; i < DatabaseBox.Items.Count; i++)
-                {
-                    if (DatabaseBox.Items[i]?.ToString() == _selectedDatabase)
-                    {
-                        DatabaseBox.SelectedIndex = i;
-                        break;
-                    }
-                }
-            }
-
-            // Collect database metadata for the initial database
-            await FetchDatabaseMetadataAsync();
-
-            ExecuteButton.IsEnabled = true;
-            ExecuteEstButton.IsEnabled = true;
-        }
+        await ShowConnectionDialogAsync();
     }
 
     private async Task ShowConnectionDialogAsync()
@@ -495,12 +461,16 @@ private async void ExecuteEstimated_Click(object? sender, RoutedEventArgs e)
 
     private async Task CaptureAndShowPlan(bool estimated, string? queryTextOverride = null)
     {
-        if (_connectionString == null || _selectedDatabase == null)
+        if (_serverConnection == null || _selectedDatabase == null)
         {
             SetStatus("Connect to a server first", autoClear: false);
             return;
         }
 
+        // Always rebuild connection string from current database selection
+        // to guarantee the picker state is reflected at execution time
+        _connectionString = _serverConnection.GetConnectionString(_credentialService, _selectedDatabase);
+
         var queryText = queryTextOverride?.Trim()
                         ?? GetSelectedTextOrNull()?.Trim()
                         ?? QueryEditor.Text?.Trim();
@@ -511,6 +481,7 @@ private async Task CaptureAndShowPlan(bool estimated, string? queryTextOverride
         }
 
         _executionCts?.Cancel();
+        _executionCts?.Dispose();
         _executionCts = new CancellationTokenSource();
         var ct = _executionCts.Token;
 
@@ -896,6 +867,8 @@ private void ClosePlanTab_Click(object? sender, RoutedEventArgs e)
     {
         if (sender is Button btn && btn.Tag is TabItem tab)
         {
+            if (tab.Content is PlanViewerControl viewer)
+                viewer.Clear();
             SubTabControl.Items.Remove(tab);
             UpdateCompareButtonState();
         }
@@ -915,6 +888,8 @@ private void PlanTabContextMenu_Click(object? sender, RoutedEventArgs e)
             case "Close":
                 if (item.Tag is TabItem tab)
                 {
+                    if (tab.Content is PlanViewerControl closeViewer)
+                        closeViewer.Clear();
                     SubTabControl.Items.Remove(tab);
                     UpdateCompareButtonState();
                 }
@@ -929,7 +904,11 @@ private void PlanTabContextMenu_Click(object? sender, RoutedEventArgs e)
                         .Where(t => t != keepTab && t.Content is PlanViewerControl)
                         .ToList();
                     foreach (var t in others)
+                    {
+                        if (t.Content is PlanViewerControl otherViewer)
+                            otherViewer.Clear();
                         SubTabControl.Items.Remove(t);
+                    }
                     SubTabControl.SelectedItem = keepTab;
                     UpdateCompareButtonState();
                 }
@@ -941,7 +920,11 @@ private void PlanTabContextMenu_Click(object? sender, RoutedEventArgs e)
                     .Where(t => t.Content is PlanViewerControl)
                     .ToList();
                 foreach (var t in planTabs)
+                {
+                    if (t.Content is PlanViewerControl allViewer)
+                        allViewer.Clear();
                     SubTabControl.Items.Remove(t);
+                }
                 SubTabControl.SelectedIndex = 0; // back to Editor
                 UpdateCompareButtonState();
                 break;
@@ -980,11 +963,17 @@ private static string GetTabLabel(TabItem tab)
         return "Plan";
     }
 
+    private bool HasQueryStoreTab()
+    {
+        return SubTabControl.Items.OfType<TabItem>()
+            .Any(t => t.Content is QueryStoreGridControl);
+    }
+
     private async void QueryStore_Click(object? sender, RoutedEventArgs e)
     {
-        if (_connectionString == null || _selectedDatabase == null)
+        // If a QS tab already exists, always show connection dialog for a fresh tab
+        if (HasQueryStoreTab() || _connectionString == null || _selectedDatabase == null)
         {
-            // No connection — open the connection dialog and wait for it
             await ShowConnectionDialogAsync();
             if (_connectionString == null || _selectedDatabase == null)
                 return;
@@ -1009,7 +998,11 @@ private async void QueryStore_Click(object? sender, RoutedEventArgs e)
 
         SetStatus("");
 
-        var grid = new QueryStoreGridControl(_connectionString, _selectedDatabase!);
+        // Build database list from the current DatabaseBox
+        var databases = DatabaseBox.Items.OfType<string>().ToList();
+
+        var grid = new QueryStoreGridControl(_serverConnection!, _credentialService,
+            _selectedDatabase!, databases);
         grid.PlansSelected += OnQueryStorePlansSelected;
 
         var headerText = new TextBlock
@@ -1019,6 +1012,12 @@ private async void QueryStore_Click(object? sender, RoutedEventArgs e)
             FontSize = 12
         };
 
+        // Update tab header when database is changed via the grid's picker
+        grid.DatabaseChanged += (_, db) =>
+        {
+            headerText.Text = $"Query Store — {db}";
+        };
+
         var closeBtn = new Button
         {
             Content = "\u2715",
@@ -1319,6 +1318,7 @@ private async void GetActualPlan_Click(object? sender, RoutedEventArgs e)
         if (!confirmed) return;
 
         _executionCts?.Cancel();
+        _executionCts?.Dispose();
         _executionCts = new CancellationTokenSource();
         var ct = _executionCts.Token;
 
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index 6fdc840..02cbd46 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -8,23 +8,19 @@
         <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" Padding="8,6"
                 BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
             <StackPanel Orientation="Horizontal" Spacing="12">
-                <StackPanel Spacing="2" VerticalAlignment="Bottom">
-                    <Button x:Name="SelectAllButton" Content="Select All" Click="SelectAll_Click"
-                            Height="28" Padding="10,0" FontSize="12"
-                            Theme="{StaticResource AppButton}"/>
-                </StackPanel>
-                <StackPanel Spacing="2" VerticalAlignment="Bottom">
-                    <Button x:Name="SelectNoneButton" Content="Select None" Click="SelectNone_Click"
-                            Height="28" Padding="10,0" FontSize="12"
-                            Theme="{StaticResource AppButton}"/>
-                </StackPanel>
-                <StackPanel Spacing="2" VerticalAlignment="Bottom">
-                    <Button x:Name="LoadButton" Content="Load Selected Plans" Click="LoadSelected_Click"
-                            Height="28" Padding="16,0" FontSize="12" IsEnabled="False"
-                            Theme="{StaticResource AppButton}"/>
+                <StackPanel Spacing="4">
+                    <TextBlock Text="Database" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
+                    <ComboBox x:Name="QsDatabaseBox" Width="200" Height="36" FontSize="13"
+                              SelectionChanged="QsDatabase_SelectionChanged"/>
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <Button x:Name="SelectToggleButton" Content="Select All" Click="SelectToggle_Click"
+                                Height="24" Padding="8,0" FontSize="11"
+                                Theme="{StaticResource AppButton}"/>
+                        <Button x:Name="LoadButton" Content="Load Selected" Click="LoadSelected_Click"
+                                Height="24" Padding="8,0" FontSize="11" IsEnabled="False"
+                                Theme="{StaticResource AppButton}"/>
+                    </StackPanel>
                 </StackPanel>
-                <TextBlock Text="|" VerticalAlignment="Bottom" Margin="0,0,0,4"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
                 <StackPanel Spacing="4">
                     <TextBlock Text="Top N" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
                     <NumericUpDown x:Name="TopNBox" Value="25" Minimum="1" Maximum="100"
@@ -39,7 +35,7 @@
                 </StackPanel>
                 <StackPanel Spacing="4">
                     <TextBlock Text="Order by" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
-                    <ComboBox x:Name="OrderByBox" Width="180" Height="36" FontSize="13"
+                    <ComboBox x:Name="OrderByBox" Width="160" Height="36" FontSize="13"
                               SelectedIndex="0">
                         <ComboBoxItem Content="Total CPU" Tag="cpu"/>
                         <ComboBoxItem Content="Avg CPU" Tag="avg-cpu"/>
@@ -56,12 +52,35 @@
                         <ComboBoxItem Content="Executions" Tag="executions"/>
                     </ComboBox>
                 </StackPanel>
-                <StackPanel Spacing="2" VerticalAlignment="Bottom">
+                <StackPanel Spacing="4">
+                    <TextBlock Text="Search by" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
+                    <ComboBox x:Name="SearchTypeBox" Width="120" Height="36" FontSize="13"
+                              SelectedIndex="0">
+                        <ComboBoxItem Content="(none)" Tag=""/>
+                        <ComboBoxItem Content="Query ID" Tag="query-id"/>
+                        <ComboBoxItem Content="Plan ID" Tag="plan-id"/>
+                        <ComboBoxItem Content="Query Hash" Tag="query-hash"/>
+                        <ComboBoxItem Content="Plan Hash" Tag="plan-hash"/>
+                        <ComboBoxItem Content="Module" Tag="module"/>
+                    </ComboBox>
+                </StackPanel>
+                <StackPanel Spacing="4">
+                    <TextBlock Text=" " FontSize="11"/>
+                    <TextBox x:Name="SearchValueBox" Width="200" Height="36" FontSize="13"
+                             Watermark="0x1AB2C3, dbo.MyProc"
+                             KeyDown="SearchValue_KeyDown"/>
+                </StackPanel>
+                <StackPanel Spacing="2" VerticalAlignment="Center">
                     <Button x:Name="FetchButton" Content="Fetch" Click="Fetch_Click"
                             Height="28" Padding="16,0" FontSize="12"
                             Theme="{StaticResource AppButton}"/>
                 </StackPanel>
-                <TextBlock x:Name="StatusText" VerticalAlignment="Bottom" Margin="0,0,0,4"
+                <StackPanel Spacing="2" VerticalAlignment="Center">
+                    <Button x:Name="ClearSearchButton" Content="Clear" Click="ClearSearch_Click"
+                            Height="28" Padding="10,0" FontSize="12"
+                            Theme="{StaticResource AppButton}"/>
+                </StackPanel>
+                <TextBlock x:Name="StatusText" VerticalAlignment="Center"
                            FontSize="12" Foreground="{DynamicResource ForegroundBrush}"/>
             </StackPanel>
         </Border>
@@ -81,8 +100,18 @@
                   BorderThickness="0"
                   ScrollViewer.HorizontalScrollBarVisibility="Auto">
             <DataGrid.ContextMenu>
-                <ContextMenu>
+                <ContextMenu Opening="ContextMenu_Opening">
                     <MenuItem Header="Load Plan" Click="LoadHighlightedPlan_Click"/>
+                    <MenuItem x:Name="ViewHistoryItem" Header="View History" Click="ViewHistory_Click"/>
+                    <Separator/>
+                    <MenuItem x:Name="CopyQueryIdItem" Header="Copy Query ID"/>
+                    <MenuItem x:Name="CopyPlanIdItem" Header="Copy Plan ID"/>
+                    <MenuItem x:Name="CopyQueryHashItem" Header="Copy Query Hash"/>
+                    <MenuItem x:Name="CopyPlanHashItem" Header="Copy Plan Hash"/>
+                    <MenuItem x:Name="CopyModuleItem" Header="Copy Module Name"/>
+                    <Separator/>
+                    <MenuItem x:Name="CopyQueryTextItem" Header="Copy Query Text"/>
+                    <MenuItem x:Name="CopyRowItem" Header="Copy Row"/>
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
@@ -95,6 +124,9 @@
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Header="QueryId" Binding="{ReflectionBinding QueryId}" Width="90"/>
                 <DataGridTextColumn Header="PlanId" Binding="{ReflectionBinding PlanId}" Width="80"/>
+                <DataGridTextColumn Header="Query Hash" Binding="{ReflectionBinding QueryHash}" Width="150"/>
+                <DataGridTextColumn Header="Plan Hash" Binding="{ReflectionBinding QueryPlanHash}" Width="150"/>
+                <DataGridTextColumn Header="Module" Binding="{ReflectionBinding ModuleName}" Width="140"/>
                 <DataGridTextColumn Header="Last Executed (Local)" Binding="{ReflectionBinding LastExecutedLocal}" Width="160"/>
                 <DataGridTextColumn Header="Executions" Binding="{ReflectionBinding ExecsDisplay}" SortMemberPath="ExecsSort" Width="100"/>
                 <DataGridTextColumn Header="Total CPU (ms)" Binding="{ReflectionBinding TotalCpuDisplay}" SortMemberPath="TotalCpuSort" Width="120"/>
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index ea4e394..218e151 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -10,15 +10,20 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using Microsoft.Data.SqlClient;
+using PlanViewer.Core.Interfaces;
 using PlanViewer.Core.Models;
+using PlanViewer.App.Dialogs;
 using PlanViewer.Core.Services;
 
 namespace PlanViewer.App.Controls;
 
 public partial class QueryStoreGridControl : UserControl
 {
-    private readonly string _connectionString;
-    private readonly string _database;
+    private readonly ServerConnection _serverConnection;
+    private readonly ICredentialService _credentialService;
+    private string _connectionString;
+    private string _database;
     private CancellationTokenSource? _fetchCts;
     private ObservableCollection<QueryStoreRow> _rows = new();
     private ObservableCollection<QueryStoreRow> _filteredRows = new();
@@ -27,26 +32,77 @@ public partial class QueryStoreGridControl : UserControl
     private ColumnFilterPopup? _filterPopupContent;
 
     public event EventHandler<List<QueryStorePlan>>? PlansSelected;
+    public event EventHandler<string>? DatabaseChanged;
 
-    public QueryStoreGridControl(string connectionString, string database)
+    public string Database => _database;
+
+    public QueryStoreGridControl(ServerConnection serverConnection, ICredentialService credentialService,
+        string initialDatabase, List<string> databases)
     {
-        _connectionString = connectionString;
-        _database = database;
+        _serverConnection = serverConnection;
+        _credentialService = credentialService;
+        _database = initialDatabase;
+        _connectionString = serverConnection.GetConnectionString(credentialService, initialDatabase);
         InitializeComponent();
         ResultsGrid.ItemsSource = _filteredRows;
         EnsureFilterPopup();
         SetupColumnHeaders();
+        PopulateDatabaseBox(databases, initialDatabase);
+    }
+
+    private void PopulateDatabaseBox(List<string> databases, string selectedDatabase)
+    {
+        QsDatabaseBox.ItemsSource = databases;
+        QsDatabaseBox.SelectedItem = selectedDatabase;
+    }
+
+    private async void QsDatabase_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (QsDatabaseBox.SelectedItem is not string db || db == _database) return;
+
+        _fetchCts?.Cancel();
+
+        // Check if Query Store is enabled on the new database
+        var newConnStr = _serverConnection.GetConnectionString(_credentialService, db);
+        StatusText.Text = "Checking Query Store...";
+
+        try
+        {
+            var (enabled, state) = await QueryStoreService.CheckEnabledAsync(newConnStr);
+            if (!enabled)
+            {
+                StatusText.Text = $"Query Store not enabled on {db} ({state ?? "unknown"})";
+                QsDatabaseBox.SelectedItem = _database; // revert
+                return;
+            }
+        }
+        catch (Exception ex)
+        {
+            StatusText.Text = ex.Message.Length > 60 ? ex.Message[..60] + "..." : ex.Message;
+            QsDatabaseBox.SelectedItem = _database; // revert
+            return;
+        }
+
+        _database = db;
+        _connectionString = newConnStr;
+        _rows.Clear();
+        _filteredRows.Clear();
+        LoadButton.IsEnabled = false;
+        StatusText.Text = "";
+        DatabaseChanged?.Invoke(this, db);
     }
 
     private async void Fetch_Click(object? sender, RoutedEventArgs e)
     {
         _fetchCts?.Cancel();
+        _fetchCts?.Dispose();
         _fetchCts = new CancellationTokenSource();
         var ct = _fetchCts.Token;
 
         var topN = (int)(TopNBox.Value ?? 25);
         var hoursBack = (int)(HoursBackBox.Value ?? 24);
         var orderBy = (OrderByBox.SelectedItem as ComboBoxItem)?.Tag?.ToString() ?? "cpu";
+        var filter = BuildSearchFilter();
 
         FetchButton.IsEnabled = false;
         LoadButton.IsEnabled = false;
@@ -57,7 +113,7 @@ private async void Fetch_Click(object? sender, RoutedEventArgs e)
         try
         {
             var plans = await QueryStoreService.FetchTopPlansAsync(
-                _connectionString, topN, orderBy, hoursBack, ct);
+                _connectionString, topN, orderBy, hoursBack, filter, ct);
 
             if (plans.Count == 0)
             {
@@ -70,6 +126,7 @@ private async void Fetch_Click(object? sender, RoutedEventArgs e)
 
             ApplyFilters();
             LoadButton.IsEnabled = true;
+            SelectToggleButton.Content = "Select None";
         }
         catch (OperationCanceledException)
         {
@@ -85,16 +142,68 @@ private async void Fetch_Click(object? sender, RoutedEventArgs e)
         }
     }
 
-    private void SelectAll_Click(object? sender, RoutedEventArgs e)
+    private QueryStoreFilter? BuildSearchFilter()
     {
-        foreach (var row in _filteredRows)
-            row.IsSelected = true;
+        var searchType = (SearchTypeBox.SelectedItem as ComboBoxItem)?.Tag?.ToString();
+        var searchValue = SearchValueBox.Text?.Trim();
+
+        if (string.IsNullOrEmpty(searchType) || string.IsNullOrEmpty(searchValue))
+            return null;
+
+        var filter = new QueryStoreFilter();
+
+        switch (searchType)
+        {
+            case "query-id" when long.TryParse(searchValue, out var qid):
+                filter.QueryId = qid;
+                break;
+            case "query-id":
+                StatusText.Text = "Invalid Query ID";
+                return null;
+            case "plan-id" when long.TryParse(searchValue, out var pid):
+                filter.PlanId = pid;
+                break;
+            case "plan-id":
+                StatusText.Text = "Invalid Plan ID";
+                return null;
+            case "query-hash":
+                filter.QueryHash = searchValue;
+                break;
+            case "plan-hash":
+                filter.QueryPlanHash = searchValue;
+                break;
+            case "module":
+                // Default to dbo schema if no schema specified, following sp_QuickieStore pattern
+                filter.ModuleName = searchValue.Contains('.') ? searchValue : $"dbo.{searchValue}";
+                break;
+            default:
+                return null;
+        }
+
+        return filter;
+    }
+
+    private void SearchValue_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+    {
+        if (e.Key == Avalonia.Input.Key.Enter)
+        {
+            Fetch_Click(sender, e);
+            e.Handled = true;
+        }
     }
 
-    private void SelectNone_Click(object? sender, RoutedEventArgs e)
+    private void ClearSearch_Click(object? sender, RoutedEventArgs e)
     {
+        SearchTypeBox.SelectedIndex = 0;
+        SearchValueBox.Text = "";
+    }
+
+    private void SelectToggle_Click(object? sender, RoutedEventArgs e)
+    {
+        var allSelected = _filteredRows.Count > 0 && _filteredRows.All(r => r.IsSelected);
         foreach (var row in _filteredRows)
-            row.IsSelected = false;
+            row.IsSelected = !allSelected;
+        SelectToggleButton.Content = allSelected ? "Select All" : "Select None";
     }
 
     private void LoadSelected_Click(object? sender, RoutedEventArgs e)
@@ -110,12 +219,92 @@ private void LoadHighlightedPlan_Click(object? sender, RoutedEventArgs e)
             PlansSelected?.Invoke(this, new List<QueryStorePlan> { row.Plan });
     }
 
+    private async void ViewHistory_Click(object? sender, RoutedEventArgs e)
+    {
+        if (ResultsGrid.SelectedItem is not QueryStoreRow row) return;
+
+        var hoursBack = (int)(HoursBackBox.Value ?? 24);
+
+        var window = new QueryStoreHistoryWindow(
+            _connectionString,
+            row.QueryId,
+            row.FullQueryText,
+            _database,
+            hoursBack);
+
+        var topLevel = Avalonia.Controls.TopLevel.GetTopLevel(this);
+        if (topLevel is Window parentWindow)
+            await window.ShowDialog(parentWindow);
+        else
+            window.Show();
+    }
+
+    // ── Context menu ────────────────────────────────────────────────────────
+
+    private void ContextMenu_Opening(object? sender, System.ComponentModel.CancelEventArgs e)
+    {
+        var row = ResultsGrid.SelectedItem as QueryStoreRow;
+        var hasRow = row != null;
+
+        ViewHistoryItem.IsEnabled = hasRow;
+        CopyQueryIdItem.IsEnabled = hasRow;
+        CopyPlanIdItem.IsEnabled = hasRow;
+        CopyQueryHashItem.IsEnabled = hasRow && !string.IsNullOrEmpty(row!.QueryHash);
+        CopyPlanHashItem.IsEnabled = hasRow && !string.IsNullOrEmpty(row!.QueryPlanHash);
+        CopyModuleItem.IsEnabled = hasRow && !string.IsNullOrEmpty(row!.ModuleName);
+        CopyQueryTextItem.IsEnabled = hasRow;
+        CopyRowItem.IsEnabled = hasRow;
+
+        // Wire click handlers (clear first to avoid stacking)
+        CopyQueryIdItem.Click -= CopyMenuItem_Click;
+        CopyPlanIdItem.Click -= CopyMenuItem_Click;
+        CopyQueryHashItem.Click -= CopyMenuItem_Click;
+        CopyPlanHashItem.Click -= CopyMenuItem_Click;
+        CopyModuleItem.Click -= CopyMenuItem_Click;
+        CopyQueryTextItem.Click -= CopyMenuItem_Click;
+        CopyRowItem.Click -= CopyMenuItem_Click;
+
+        if (!hasRow) return;
+
+        CopyQueryIdItem.Tag = row!.QueryId.ToString();
+        CopyPlanIdItem.Tag = row.PlanId.ToString();
+        CopyQueryHashItem.Tag = row.QueryHash;
+        CopyPlanHashItem.Tag = row.QueryPlanHash;
+        CopyModuleItem.Tag = row.ModuleName;
+        CopyQueryTextItem.Tag = row.FullQueryText;
+        CopyRowItem.Tag = $"{row.QueryId}\t{row.PlanId}\t{row.QueryHash}\t{row.QueryPlanHash}\t{row.ModuleName}\t{row.LastExecutedLocal}\t{row.ExecsDisplay}\t{row.TotalCpuDisplay}\t{row.AvgCpuDisplay}\t{row.TotalDurDisplay}\t{row.AvgDurDisplay}\t{row.TotalReadsDisplay}\t{row.AvgReadsDisplay}\t{row.TotalWritesDisplay}\t{row.AvgWritesDisplay}\t{row.TotalPhysReadsDisplay}\t{row.AvgPhysReadsDisplay}\t{row.TotalMemDisplay}\t{row.AvgMemDisplay}\t{row.FullQueryText}";
+
+        CopyQueryIdItem.Click += CopyMenuItem_Click;
+        CopyPlanIdItem.Click += CopyMenuItem_Click;
+        CopyQueryHashItem.Click += CopyMenuItem_Click;
+        CopyPlanHashItem.Click += CopyMenuItem_Click;
+        CopyModuleItem.Click += CopyMenuItem_Click;
+        CopyQueryTextItem.Click += CopyMenuItem_Click;
+        CopyRowItem.Click += CopyMenuItem_Click;
+    }
+
+    private async void CopyMenuItem_Click(object? sender, RoutedEventArgs e)
+    {
+        if (sender is MenuItem item && item.Tag is string text)
+            await SetClipboardTextAsync(text);
+    }
+
+    private async System.Threading.Tasks.Task SetClipboardTextAsync(string text)
+    {
+        var topLevel = Avalonia.Controls.TopLevel.GetTopLevel(this);
+        if (topLevel?.Clipboard != null)
+            await topLevel.Clipboard.SetTextAsync(text);
+    }
+
     // ── Column filter infrastructure ───────────────────────────────────────
 
     private static readonly Dictionary<string, Func<QueryStoreRow, string>> TextAccessors = new()
     {
-        ["LastExecuted"] = r => r.LastExecutedLocal,
-        ["QueryText"]    = r => r.FullQueryText,
+        ["QueryHash"]     = r => r.QueryHash,
+        ["PlanHash"]      = r => r.QueryPlanHash,
+        ["ModuleName"]    = r => r.ModuleName,
+        ["LastExecuted"]  = r => r.LastExecutedLocal,
+        ["QueryText"]     = r => r.FullQueryText,
     };
 
     private static readonly Dictionary<string, Func<QueryStoreRow, double>> NumericAccessors = new()
@@ -142,21 +331,24 @@ private void SetupColumnHeaders()
         var cols = ResultsGrid.Columns;
         SetColumnFilterButton(cols[1],  "QueryId",        "Query ID");
         SetColumnFilterButton(cols[2],  "PlanId",         "Plan ID");
-        SetColumnFilterButton(cols[3],  "LastExecuted",   "Last Executed (Local)");
-        SetColumnFilterButton(cols[4],  "Executions",     "Executions");
-        SetColumnFilterButton(cols[5],  "TotalCpu",       "Total CPU (ms)");
-        SetColumnFilterButton(cols[6],  "AvgCpu",         "Avg CPU (ms)");
-        SetColumnFilterButton(cols[7],  "TotalDuration",  "Total Duration (ms)");
-        SetColumnFilterButton(cols[8],  "AvgDuration",    "Avg Duration (ms)");
-        SetColumnFilterButton(cols[9],  "TotalReads",     "Total Reads");
-        SetColumnFilterButton(cols[10], "AvgReads",       "Avg Reads");
-        SetColumnFilterButton(cols[11], "TotalWrites",    "Total Writes");
-        SetColumnFilterButton(cols[12], "AvgWrites",      "Avg Writes");
-        SetColumnFilterButton(cols[13], "TotalPhysReads", "Total Physical Reads");
-        SetColumnFilterButton(cols[14], "AvgPhysReads",   "Avg Physical Reads");
-        SetColumnFilterButton(cols[15], "TotalMemory",    "Total Memory (MB)");
-        SetColumnFilterButton(cols[16], "AvgMemory",      "Avg Memory (MB)");
-        SetColumnFilterButton(cols[17], "QueryText",      "Query Text");
+        SetColumnFilterButton(cols[3],  "QueryHash",      "Query Hash");
+        SetColumnFilterButton(cols[4],  "PlanHash",       "Plan Hash");
+        SetColumnFilterButton(cols[5],  "ModuleName",     "Module");
+        SetColumnFilterButton(cols[6],  "LastExecuted",   "Last Executed (Local)");
+        SetColumnFilterButton(cols[7],  "Executions",     "Executions");
+        SetColumnFilterButton(cols[8],  "TotalCpu",       "Total CPU (ms)");
+        SetColumnFilterButton(cols[9],  "AvgCpu",         "Avg CPU (ms)");
+        SetColumnFilterButton(cols[10], "TotalDuration",  "Total Duration (ms)");
+        SetColumnFilterButton(cols[11], "AvgDuration",    "Avg Duration (ms)");
+        SetColumnFilterButton(cols[12], "TotalReads",     "Total Reads");
+        SetColumnFilterButton(cols[13], "AvgReads",       "Avg Reads");
+        SetColumnFilterButton(cols[14], "TotalWrites",    "Total Writes");
+        SetColumnFilterButton(cols[15], "AvgWrites",      "Avg Writes");
+        SetColumnFilterButton(cols[16], "TotalPhysReads", "Total Physical Reads");
+        SetColumnFilterButton(cols[17], "AvgPhysReads",   "Avg Physical Reads");
+        SetColumnFilterButton(cols[18], "TotalMemory",    "Total Memory (MB)");
+        SetColumnFilterButton(cols[19], "AvgMemory",      "Avg Memory (MB)");
+        SetColumnFilterButton(cols[20], "QueryText",      "Query Text");
     }
 
     private void SetColumnFilterButton(DataGridColumn col, string columnId, string label)
@@ -353,6 +545,9 @@ public bool IsSelected
 
     public long QueryId => Plan.QueryId;
     public long PlanId => Plan.PlanId;
+    public string QueryHash => Plan.QueryHash;
+    public string QueryPlanHash => Plan.QueryPlanHash;
+    public string ModuleName => Plan.ModuleName;
 
     public string ExecsDisplay => Plan.CountExecutions.ToString("N0");
     public string TotalCpuDisplay => (Plan.TotalCpuTimeUs / 1000.0).ToString("N0");
diff --git a/src/PlanViewer.App/Dialogs/QueryStoreDialog.axaml b/src/PlanViewer.App/Dialogs/QueryStoreDialog.axaml
deleted file mode 100644
index 1ccefae..0000000
--- a/src/PlanViewer.App/Dialogs/QueryStoreDialog.axaml
+++ /dev/null
@@ -1,89 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="PlanViewer.App.Dialogs.QueryStoreDialog"
-        Title="Query Store Analysis"
-        Width="700" Height="520"
-        MinWidth="600" MinHeight="400"
-        WindowStartupLocation="CenterOwner"
-        Icon="avares://PlanViewer.App/EDD.ico"
-        Background="{DynamicResource BackgroundBrush}">
-
-    <Grid Margin="16" RowDefinitions="Auto,Auto,*,Auto">
-        <!-- Options row -->
-        <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="12" Margin="0,0,0,12">
-            <StackPanel Spacing="4">
-                <TextBlock Text="Top N" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
-                <NumericUpDown x:Name="TopNBox" Value="10" Minimum="1" Maximum="50"
-                               Width="100" Height="32" FontSize="13" FormatString="0"
-                               HorizontalContentAlignment="Center"/>
-            </StackPanel>
-            <StackPanel Spacing="4">
-                <TextBlock Text="Order by" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
-                <ComboBox x:Name="OrderByBox" Width="180" Height="28" FontSize="12" SelectedIndex="0">
-                    <ComboBoxItem Content="Total CPU" Tag="cpu"/>
-                    <ComboBoxItem Content="Avg CPU" Tag="avg-cpu"/>
-                    <ComboBoxItem Content="Total Duration" Tag="duration"/>
-                    <ComboBoxItem Content="Avg Duration" Tag="avg-duration"/>
-                    <ComboBoxItem Content="Total Reads" Tag="reads"/>
-                    <ComboBoxItem Content="Avg Reads" Tag="avg-reads"/>
-                    <ComboBoxItem Content="Total Writes" Tag="writes"/>
-                    <ComboBoxItem Content="Avg Writes" Tag="avg-writes"/>
-                    <ComboBoxItem Content="Total Physical Reads" Tag="physical-reads"/>
-                    <ComboBoxItem Content="Avg Physical Reads" Tag="avg-physical-reads"/>
-                    <ComboBoxItem Content="Total Memory Grant" Tag="memory"/>
-                    <ComboBoxItem Content="Avg Memory Grant" Tag="avg-memory"/>
-                    <ComboBoxItem Content="Executions" Tag="executions"/>
-                </ComboBox>
-            </StackPanel>
-            <StackPanel Spacing="4">
-                <TextBlock Text="Hours back" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
-                <NumericUpDown x:Name="HoursBackBox" Value="24" Minimum="1" Maximum="168"
-                               Width="100" Height="32" FontSize="13" FormatString="0"
-                               HorizontalContentAlignment="Center"/>
-            </StackPanel>
-            <StackPanel Spacing="4" VerticalAlignment="Bottom">
-                <Button x:Name="FetchButton" Content="Fetch" Click="Fetch_Click"
-                        Height="28" Padding="16,0" FontSize="12"
-                        Theme="{StaticResource AppButton}"/>
-            </StackPanel>
-            <TextBlock x:Name="StatusText" VerticalAlignment="Bottom" Margin="0,0,0,4"
-                       FontSize="12" Foreground="{DynamicResource ForegroundBrush}"/>
-        </StackPanel>
-
-        <!-- Column headers -->
-        <Border Grid.Row="1" x:Name="HeaderRow" IsVisible="False"
-                Background="{DynamicResource BackgroundDarkBrush}" Padding="8,4"
-                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
-            <Grid ColumnDefinitions="30,70,70,120,100,*">
-                <CheckBox Grid.Column="0" x:Name="SelectAllBox" IsChecked="True"
-                          Click="SelectAll_Click" VerticalAlignment="Center"/>
-                <TextBlock Grid.Column="1" Text="Query ID" FontSize="11" FontWeight="SemiBold"
-                           Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-                <TextBlock Grid.Column="2" Text="Plan ID" FontSize="11" FontWeight="SemiBold"
-                           Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-                <TextBlock Grid.Column="3" x:Name="MetricHeader" Text="Metric" FontSize="11" FontWeight="SemiBold"
-                           Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-                <TextBlock Grid.Column="4" Text="Executions" FontSize="11" FontWeight="SemiBold"
-                           Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-                <TextBlock Grid.Column="5" Text="Query Text" FontSize="11" FontWeight="SemiBold"
-                           Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-            </Grid>
-        </Border>
-
-        <!-- Results list -->
-        <ScrollViewer Grid.Row="2" x:Name="ResultsScroller"
-                      VerticalScrollBarVisibility="Auto" Margin="0,0,0,12">
-            <StackPanel x:Name="ResultsPanel" Spacing="0"/>
-        </ScrollViewer>
-
-        <!-- Buttons -->
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
-            <Button x:Name="LoadButton" Content="Load Selected" Click="Load_Click"
-                    Height="32" Padding="16,0" FontSize="13" IsEnabled="False"
-                    Theme="{StaticResource AppButton}"/>
-            <Button Content="Cancel" Click="Cancel_Click"
-                    Height="32" Padding="16,0" FontSize="13"
-                    Theme="{StaticResource AppButton}"/>
-        </StackPanel>
-    </Grid>
-</Window>
diff --git a/src/PlanViewer.App/Dialogs/QueryStoreDialog.axaml.cs b/src/PlanViewer.App/Dialogs/QueryStoreDialog.axaml.cs
deleted file mode 100644
index bd765fd..0000000
--- a/src/PlanViewer.App/Dialogs/QueryStoreDialog.axaml.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using PlanViewer.Core.Models;
-using PlanViewer.Core.Services;
-
-namespace PlanViewer.App.Dialogs;
-
-public partial class QueryStoreDialog : Window
-{
-    private readonly string _connectionString;
-    private readonly string _database;
-    private List<QueryStorePlan>? _plans;
-    private readonly List<CheckBox> _rowCheckBoxes = new();
-    private CancellationTokenSource? _fetchCts;
-
-    public List<QueryStorePlan> SelectedPlans { get; } = new();
-
-    public QueryStoreDialog(string connectionString, string database)
-    {
-        _connectionString = connectionString;
-        _database = database;
-        InitializeComponent();
-        Title = $"Query Store — {database}";
-    }
-
-    private async void Fetch_Click(object? sender, RoutedEventArgs e)
-    {
-        _fetchCts?.Cancel();
-        _fetchCts = new CancellationTokenSource();
-        var ct = _fetchCts.Token;
-
-        var topN = (int)(TopNBox.Value ?? 10);
-        var hoursBack = (int)(HoursBackBox.Value ?? 24);
-        var orderBy = "cpu";
-        if (OrderByBox.SelectedItem is ComboBoxItem item && item.Tag is string tag)
-            orderBy = tag;
-
-        FetchButton.IsEnabled = false;
-        LoadButton.IsEnabled = false;
-        StatusText.Text = "Fetching...";
-        ResultsPanel.Children.Clear();
-        _rowCheckBoxes.Clear();
-        HeaderRow.IsVisible = false;
-
-        try
-        {
-            _plans = await QueryStoreService.FetchTopPlansAsync(
-                _connectionString, topN, orderBy, hoursBack, ct);
-
-            if (_plans.Count == 0)
-            {
-                StatusText.Text = "No Query Store data found.";
-                return;
-            }
-
-            StatusText.Text = $"{_plans.Count} plans";
-
-            // Update metric header based on order-by
-            MetricHeader.Text = GetMetricHeader(orderBy);
-            HeaderRow.IsVisible = true;
-
-            for (int i = 0; i < _plans.Count; i++)
-            {
-                var plan = _plans[i];
-                var row = BuildResultRow(plan, orderBy, i);
-                ResultsPanel.Children.Add(row);
-            }
-
-            SelectAllBox.IsChecked = true;
-            LoadButton.IsEnabled = true;
-        }
-        catch (OperationCanceledException)
-        {
-            StatusText.Text = "Cancelled.";
-        }
-        catch (Exception ex)
-        {
-            StatusText.Text = ex.Message.Length > 80 ? ex.Message[..80] + "..." : ex.Message;
-        }
-        finally
-        {
-            FetchButton.IsEnabled = true;
-        }
-    }
-
-    private Border BuildResultRow(QueryStorePlan plan, string orderBy, int index)
-    {
-        var cb = new CheckBox { IsChecked = true, VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center };
-        _rowCheckBoxes.Add(cb);
-
-        var queryPreview = plan.QueryText.Length > 80
-            ? plan.QueryText[..80].Replace("\n", " ").Replace("\r", "") + "..."
-            : plan.QueryText.Replace("\n", " ").Replace("\r", "");
-
-        var grid = new Grid
-        {
-            ColumnDefinitions = ColumnDefinitions.Parse("30,70,70,120,100,*"),
-            Children =
-            {
-                SetCol(cb, 0),
-                SetCol(new TextBlock { Text = plan.QueryId.ToString(), FontSize = 11,
-                    Foreground = Brush.Parse("#E4E6EB"), VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center }, 1),
-                SetCol(new TextBlock { Text = plan.PlanId.ToString(), FontSize = 11,
-                    Foreground = Brush.Parse("#E4E6EB"), VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center }, 2),
-                SetCol(new TextBlock { Text = FormatMetric(plan, orderBy), FontSize = 11,
-                    Foreground = Brush.Parse("#E4E6EB"), VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center }, 3),
-                SetCol(new TextBlock { Text = plan.CountExecutions.ToString("N0"), FontSize = 11,
-                    Foreground = Brush.Parse("#E4E6EB"), VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center }, 4),
-                SetCol(new TextBlock { Text = queryPreview, FontSize = 11, TextTrimming = TextTrimming.CharacterEllipsis,
-                    Foreground = Brush.Parse("#B0B6C0"), VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center }, 5),
-            }
-        };
-
-        var bg = index % 2 == 0 ? "#1A1D23" : "#1E2128";
-        return new Border
-        {
-            Background = Brush.Parse(bg),
-            Padding = new Thickness(8, 6),
-            Child = grid
-        };
-    }
-
-    private static Control SetCol(Control control, int col)
-    {
-        Grid.SetColumn(control, col);
-        return control;
-    }
-
-    private static string GetMetricHeader(string orderBy)
-    {
-        return orderBy.ToLowerInvariant() switch
-        {
-            "cpu" => "Total CPU",
-            "avg-cpu" => "Avg CPU",
-            "duration" => "Total Duration",
-            "avg-duration" => "Avg Duration",
-            "reads" => "Total Reads",
-            "avg-reads" => "Avg Reads",
-            "writes" => "Total Writes",
-            "avg-writes" => "Avg Writes",
-            "physical-reads" => "Total Phys Rds",
-            "avg-physical-reads" => "Avg Phys Rds",
-            "memory" => "Total Mem Grant",
-            "avg-memory" => "Avg Mem Grant",
-            "executions" => "Executions",
-            _ => "Total CPU"
-        };
-    }
-
-    private static string FormatMetric(QueryStorePlan plan, string orderBy)
-    {
-        return orderBy.ToLowerInvariant() switch
-        {
-            "cpu"              => $"{plan.TotalCpuTimeUs / 1000.0:N0}ms",
-            "avg-cpu"          => $"{plan.AvgCpuTimeUs / 1000.0:N1}ms",
-            "duration"         => $"{plan.TotalDurationUs / 1000.0:N0}ms",
-            "avg-duration"     => $"{plan.AvgDurationUs / 1000.0:N1}ms",
-            "reads"            => $"{plan.TotalLogicalIoReads:N0}pg",
-            "avg-reads"        => $"{plan.AvgLogicalIoReads:N0}pg",
-            "writes"           => $"{plan.TotalLogicalIoWrites:N0}pg",
-            "avg-writes"       => $"{plan.AvgLogicalIoWrites:N0}pg",
-            "physical-reads"   => $"{plan.TotalPhysicalIoReads:N0}pg",
-            "avg-physical-reads" => $"{plan.AvgPhysicalIoReads:N0}pg",
-            "memory"           => $"{plan.TotalMemoryGrantPages:N0}pg",
-            "avg-memory"       => $"{plan.AvgMemoryGrantPages:N0}pg",
-            "executions"       => $"{plan.CountExecutions:N0}",
-            _                  => $"{plan.TotalCpuTimeUs / 1000.0:N0}ms"
-        };
-    }
-
-    private void SelectAll_Click(object? sender, RoutedEventArgs e)
-    {
-        var isChecked = SelectAllBox.IsChecked == true;
-        foreach (var cb in _rowCheckBoxes)
-            cb.IsChecked = isChecked;
-    }
-
-    private void Load_Click(object? sender, RoutedEventArgs e)
-    {
-        if (_plans == null) return;
-
-        for (int i = 0; i < _plans.Count && i < _rowCheckBoxes.Count; i++)
-        {
-            if (_rowCheckBoxes[i].IsChecked == true)
-                SelectedPlans.Add(_plans[i]);
-        }
-
-        Close(true);
-    }
-
-    private void Cancel_Click(object? sender, RoutedEventArgs e)
-    {
-        _fetchCts?.Cancel();
-        Close(false);
-    }
-}
diff --git a/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml b/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml
new file mode 100644
index 0000000..08e58fb
--- /dev/null
+++ b/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml
@@ -0,0 +1,112 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:scottplot="clr-namespace:ScottPlot.Avalonia;assembly=ScottPlot.Avalonia"
+        x:Class="PlanViewer.App.Dialogs.QueryStoreHistoryWindow"
+        Title="Query Store History"
+        Width="1280" Height="800"
+        MinWidth="900" MinHeight="600"
+        WindowStartupLocation="CenterOwner"
+        Icon="avares://PlanViewer.App/EDD.ico"
+        Background="{DynamicResource BackgroundBrush}">
+
+    <Grid Margin="12" RowDefinitions="Auto,Auto,300,*,Auto">
+
+        <!-- Row 0: Header -->
+        <StackPanel Grid.Row="0" Margin="0,0,0,8">
+            <TextBlock x:Name="QueryIdentifierText" FontSize="16" FontWeight="Bold"
+                       Foreground="{DynamicResource ForegroundBrush}"/>
+            <TextBlock x:Name="SummaryText" FontSize="12" Margin="0,4,0,0"
+                       Foreground="{DynamicResource ForegroundBrush}"
+                       TextTrimming="CharacterEllipsis"/>
+        </StackPanel>
+
+        <!-- Row 1: Controls toolbar -->
+        <Border Grid.Row="1" Background="{DynamicResource BackgroundDarkBrush}" Padding="8,6"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="3"
+                Margin="0,0,0,8">
+            <StackPanel Orientation="Horizontal" Spacing="12">
+                <StackPanel Spacing="2">
+                    <TextBlock Text="Metric" FontSize="11"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <ComboBox x:Name="MetricSelector" Width="200" Height="32" FontSize="13"
+                              SelectionChanged="MetricSelector_SelectionChanged">
+                        <ComboBoxItem Content="Avg CPU (ms)" Tag="AvgCpuMs" IsSelected="True"/>
+                        <ComboBoxItem Content="Avg Duration (ms)" Tag="AvgDurationMs"/>
+                        <ComboBoxItem Content="Avg Logical Reads" Tag="AvgLogicalReads"/>
+                        <ComboBoxItem Content="Avg Logical Writes" Tag="AvgLogicalWrites"/>
+                        <ComboBoxItem Content="Avg Physical Reads" Tag="AvgPhysicalReads"/>
+                        <ComboBoxItem Content="Avg Memory (MB)" Tag="AvgMemoryMb"/>
+                        <ComboBoxItem Content="Avg Rows" Tag="AvgRowcount"/>
+                        <ComboBoxItem Content="Total CPU (ms)" Tag="TotalCpuMs"/>
+                        <ComboBoxItem Content="Total Duration (ms)" Tag="TotalDurationMs"/>
+                        <ComboBoxItem Content="Total Reads" Tag="TotalLogicalReads"/>
+                        <ComboBoxItem Content="Total Writes" Tag="TotalLogicalWrites"/>
+                        <ComboBoxItem Content="Total Physical Reads" Tag="TotalPhysicalReads"/>
+                        <ComboBoxItem Content="Executions" Tag="CountExecutions"/>
+                    </ComboBox>
+                </StackPanel>
+                <StackPanel Spacing="2">
+                    <TextBlock Text="Hours back" FontSize="11"
+                               Foreground="{DynamicResource ForegroundBrush}"/>
+                    <NumericUpDown x:Name="HoursBackBox" Value="24" Minimum="1" Maximum="720"
+                                   Width="120" Height="32" FontSize="13" FormatString="0"
+                                   HorizontalContentAlignment="Center"/>
+                </StackPanel>
+                <StackPanel Spacing="2" VerticalAlignment="Bottom">
+                    <Button x:Name="RefreshButton" Content="Refresh" Click="Refresh_Click"
+                            Height="28" Padding="16,0" FontSize="12"
+                            Theme="{StaticResource AppButton}"/>
+                </StackPanel>
+                <TextBlock x:Name="StatusText" VerticalAlignment="Center"
+                           FontSize="12" Foreground="{DynamicResource ForegroundBrush}"/>
+            </StackPanel>
+        </Border>
+
+        <!-- Row 2: Chart -->
+        <Border Grid.Row="2" Background="{DynamicResource BackgroundDarkBrush}"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" CornerRadius="3"
+                Margin="0,0,0,8">
+            <scottplot:AvaPlot x:Name="HistoryChart"/>
+        </Border>
+
+        <!-- Row 3: DataGrid -->
+        <DataGrid Grid.Row="3" x:Name="HistoryDataGrid"
+                  AutoGenerateColumns="False" IsReadOnly="True"
+                  CanUserSortColumns="True" CanUserReorderColumns="True"
+                  CanUserResizeColumns="True"
+                  GridLinesVisibility="Horizontal" HeadersVisibility="Column"
+                  FontSize="11"
+                  Background="{DynamicResource BackgroundDarkBrush}"
+                  BorderThickness="0"
+                  ScrollViewer.HorizontalScrollBarVisibility="Auto">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Plan ID" Binding="{ReflectionBinding PlanId}" Width="80"/>
+                <DataGridTextColumn Header="Plan Hash" Binding="{ReflectionBinding QueryPlanHash}" Width="150"/>
+                <DataGridTextColumn Header="Interval Start" Binding="{ReflectionBinding IntervalStartLocal}" Width="140"/>
+                <DataGridTextColumn Header="Executions" Binding="{ReflectionBinding CountExecutions}" Width="90"/>
+                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{ReflectionBinding AvgDurationMs}" Width="130"/>
+                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{ReflectionBinding AvgCpuMs}" Width="110"/>
+                <DataGridTextColumn Header="Avg Reads" Binding="{ReflectionBinding AvgLogicalReads}" Width="90"/>
+                <DataGridTextColumn Header="Avg Writes" Binding="{ReflectionBinding AvgLogicalWrites}" Width="90"/>
+                <DataGridTextColumn Header="Avg Phys Reads" Binding="{ReflectionBinding AvgPhysicalReads}" Width="110"/>
+                <DataGridTextColumn Header="Avg Memory (MB)" Binding="{ReflectionBinding AvgMemoryMb}" Width="120"/>
+                <DataGridTextColumn Header="Avg Rows" Binding="{ReflectionBinding AvgRowcount}" Width="80"/>
+                <DataGridTextColumn Header="Total Duration (ms)" Binding="{ReflectionBinding TotalDurationMs}" Width="140"/>
+                <DataGridTextColumn Header="Total CPU (ms)" Binding="{ReflectionBinding TotalCpuMs}" Width="120"/>
+                <DataGridTextColumn Header="Total Reads" Binding="{ReflectionBinding TotalLogicalReads}" Width="100"/>
+                <DataGridTextColumn Header="Total Writes" Binding="{ReflectionBinding TotalLogicalWrites}" Width="100"/>
+                <DataGridTextColumn Header="Total Phys Reads" Binding="{ReflectionBinding TotalPhysicalReads}" Width="120"/>
+                <DataGridTextColumn Header="Min DOP" Binding="{ReflectionBinding MinDop}" Width="70"/>
+                <DataGridTextColumn Header="Max DOP" Binding="{ReflectionBinding MaxDop}" Width="70"/>
+                <DataGridTextColumn Header="Last Execution" Binding="{ReflectionBinding LastExecutionLocal}" Width="140"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- Row 4: Footer -->
+        <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right"
+                    Margin="0,8,0,0">
+            <Button Content="Close" Click="Close_Click" Padding="20,6" FontSize="12"
+                    Theme="{StaticResource AppButton}"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs b/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs
new file mode 100644
index 0000000..39c2361
--- /dev/null
+++ b/src/PlanViewer.App/Dialogs/QueryStoreHistoryWindow.axaml.cs
@@ -0,0 +1,283 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using PlanViewer.Core.Models;
+using PlanViewer.Core.Services;
+using ScottPlot;
+
+namespace PlanViewer.App.Dialogs;
+
+public partial class QueryStoreHistoryWindow : Window
+{
+    private readonly string _connectionString;
+    private readonly long _queryId;
+    private readonly string _database;
+    private CancellationTokenSource? _fetchCts;
+    private List<QueryStoreHistoryRow> _historyData = new();
+    private readonly List<(ScottPlot.Plottables.Scatter Scatter, string Label)> _scatters = new();
+
+    // Hover tooltip
+    private readonly Popup _tooltip;
+    private readonly TextBlock _tooltipText;
+
+    private static readonly ScottPlot.Color[] PlanColors =
+    {
+        ScottPlot.Color.FromHex("#4FC3F7"),
+        ScottPlot.Color.FromHex("#FF7043"),
+        ScottPlot.Color.FromHex("#66BB6A"),
+        ScottPlot.Color.FromHex("#AB47BC"),
+        ScottPlot.Color.FromHex("#FFA726"),
+        ScottPlot.Color.FromHex("#26C6DA"),
+        ScottPlot.Color.FromHex("#F06292"),
+        ScottPlot.Color.FromHex("#A1887F"),
+    };
+
+    public QueryStoreHistoryWindow(string connectionString, long queryId,
+        string queryText, string database, int hoursBack = 24)
+    {
+        _connectionString = connectionString;
+        _queryId = queryId;
+        _database = database;
+        InitializeComponent();
+
+        HoursBackBox.Value = hoursBack;
+
+        var preview = queryText.Length > 120
+            ? queryText[..120].Replace("\n", " ").Replace("\r", "") + "..."
+            : queryText.Replace("\n", " ").Replace("\r", "");
+        QueryIdentifierText.Text = $"Query Store History: Query {queryId} in [{database}]";
+        SummaryText.Text = preview;
+
+        // Build hover tooltip
+        _tooltipText = new TextBlock
+        {
+            Foreground = new SolidColorBrush(Avalonia.Media.Color.FromRgb(0xE0, 0xE0, 0xE0)),
+            FontSize = 13
+        };
+        _tooltip = new Popup
+        {
+            PlacementTarget = HistoryChart,
+            Placement = PlacementMode.Pointer,
+            IsHitTestVisible = false,
+            IsLightDismissEnabled = false,
+            Child = new Border
+            {
+                Background = new SolidColorBrush(Avalonia.Media.Color.FromRgb(0x33, 0x33, 0x33)),
+                BorderBrush = new SolidColorBrush(Avalonia.Media.Color.FromRgb(0x55, 0x55, 0x55)),
+                BorderThickness = new Thickness(1),
+                CornerRadius = new CornerRadius(3),
+                Padding = new Thickness(8, 4, 8, 4),
+                Child = _tooltipText
+            }
+        };
+        ((Grid)Content!).Children.Add(_tooltip);
+
+        HistoryChart.PointerMoved += OnChartPointerMoved;
+        HistoryChart.PointerExited += (_, _) => _tooltip.IsOpen = false;
+
+        Opened += async (_, _) => await LoadHistoryAsync();
+    }
+
+    private async System.Threading.Tasks.Task LoadHistoryAsync()
+    {
+        _fetchCts?.Cancel();
+        _fetchCts?.Dispose();
+        _fetchCts = new CancellationTokenSource();
+        var ct = _fetchCts.Token;
+
+        var hoursBack = (int)(HoursBackBox.Value ?? 24);
+        RefreshButton.IsEnabled = false;
+        StatusText.Text = "Loading...";
+
+        try
+        {
+            _historyData = await QueryStoreService.FetchHistoryAsync(
+                _connectionString, _queryId, hoursBack, ct);
+
+            HistoryDataGrid.ItemsSource = _historyData;
+
+            if (_historyData.Count > 0)
+            {
+                var planCount = _historyData.Select(r => r.PlanId).Distinct().Count();
+                var totalExec = _historyData.Sum(r => r.CountExecutions);
+                var first = _historyData.Min(r => r.IntervalStartUtc).ToLocalTime();
+                var last = _historyData.Max(r => r.IntervalStartUtc).ToLocalTime();
+                StatusText.Text = $"{_historyData.Count} intervals, {planCount} plan(s), " +
+                                  $"{totalExec:N0} total executions | " +
+                                  $"{first:MM/dd HH:mm} to {last:MM/dd HH:mm}";
+            }
+            else
+            {
+                StatusText.Text = "No history data found for this query.";
+            }
+
+            UpdateChart();
+        }
+        catch (OperationCanceledException)
+        {
+            StatusText.Text = "Cancelled.";
+        }
+        catch (Exception ex)
+        {
+            StatusText.Text = ex.Message.Length > 80 ? ex.Message[..80] + "..." : ex.Message;
+        }
+        finally
+        {
+            RefreshButton.IsEnabled = true;
+        }
+    }
+
+    private void UpdateChart()
+    {
+        HistoryChart.Plot.Clear();
+        _scatters.Clear();
+
+        if (_historyData.Count == 0)
+        {
+            HistoryChart.Refresh();
+            return;
+        }
+
+        var selected = MetricSelector.SelectedItem as ComboBoxItem;
+        var tag = selected?.Tag?.ToString() ?? "AvgCpuMs";
+        var label = selected?.Content?.ToString() ?? "Avg CPU (ms)";
+
+        var planGroups = _historyData
+            .GroupBy(r => r.PlanId)
+            .OrderBy(g => g.Key)
+            .ToList();
+
+        int colorIndex = 0;
+        foreach (var group in planGroups)
+        {
+            var ordered = group.OrderBy(r => r.IntervalStartUtc).ToList();
+            var xs = ordered.Select(r => r.IntervalStartUtc.ToLocalTime().ToOADate()).ToArray();
+            var ys = ordered.Select(r => GetMetricValue(r, tag)).ToArray();
+
+            var scatter = HistoryChart.Plot.Add.Scatter(xs, ys);
+            scatter.Color = PlanColors[colorIndex % PlanColors.Length];
+            scatter.LegendText = $"Plan {group.Key}";
+            scatter.LineWidth = 2;
+            scatter.MarkerSize = ordered.Count <= 2 ? 8 : 4;
+
+            _scatters.Add((scatter, $"Plan {group.Key}"));
+            colorIndex++;
+        }
+
+        HistoryChart.Plot.Axes.DateTimeTicksBottom();
+        HistoryChart.Plot.YLabel(label);
+        ApplyDarkTheme();
+        HistoryChart.Refresh();
+    }
+
+    private void OnChartPointerMoved(object? sender, PointerEventArgs e)
+    {
+        if (_scatters.Count == 0) { _tooltip.IsOpen = false; return; }
+
+        try
+        {
+            var pos = e.GetPosition(HistoryChart);
+            var scaling = HistoryChart.Bounds.Width > 0
+                ? (float)(HistoryChart.Plot.RenderManager.LastRender.FigureRect.Width / HistoryChart.Bounds.Width)
+                : 1f;
+            var pixel = new ScottPlot.Pixel((float)(pos.X * scaling), (float)(pos.Y * scaling));
+            var mouseCoords = HistoryChart.Plot.GetCoordinates(pixel);
+
+            double bestDist = double.MaxValue;
+            ScottPlot.DataPoint bestPoint = default;
+            string bestLabel = "";
+            bool found = false;
+
+            foreach (var (scatter, label) in _scatters)
+            {
+                var nearest = scatter.Data.GetNearest(mouseCoords, HistoryChart.Plot.LastRender);
+                if (!nearest.IsReal) continue;
+
+                var nearestPixel = HistoryChart.Plot.GetPixel(
+                    new ScottPlot.Coordinates(nearest.X, nearest.Y));
+                double dx = Math.Abs(nearestPixel.X - pixel.X);
+                double dy = Math.Abs(nearestPixel.Y - pixel.Y);
+
+                if (dx < 80 && dy < bestDist)
+                {
+                    bestDist = dy;
+                    bestPoint = nearest;
+                    bestLabel = label;
+                    found = true;
+                }
+            }
+
+            if (found)
+            {
+                var time = DateTime.FromOADate(bestPoint.X);
+                var metricLabel = (MetricSelector.SelectedItem as ComboBoxItem)?.Content?.ToString() ?? "";
+                _tooltipText.Text = $"{bestLabel}\n{metricLabel}: {bestPoint.Y:N2}\n{time:MM/dd HH:mm}";
+                _tooltip.IsOpen = true;
+            }
+            else
+            {
+                _tooltip.IsOpen = false;
+            }
+        }
+        catch
+        {
+            _tooltip.IsOpen = false;
+        }
+    }
+
+    private static double GetMetricValue(QueryStoreHistoryRow row, string tag) => tag switch
+    {
+        "AvgCpuMs"           => row.AvgCpuMs,
+        "AvgDurationMs"      => row.AvgDurationMs,
+        "AvgLogicalReads"    => row.AvgLogicalReads,
+        "AvgLogicalWrites"   => row.AvgLogicalWrites,
+        "AvgPhysicalReads"   => row.AvgPhysicalReads,
+        "AvgMemoryMb"        => row.AvgMemoryMb,
+        "AvgRowcount"        => row.AvgRowcount,
+        "TotalCpuMs"         => row.TotalCpuMs,
+        "TotalDurationMs"    => row.TotalDurationMs,
+        "TotalLogicalReads"  => row.TotalLogicalReads,
+        "TotalLogicalWrites" => row.TotalLogicalWrites,
+        "TotalPhysicalReads" => row.TotalPhysicalReads,
+        "CountExecutions"    => row.CountExecutions,
+        _                    => row.AvgCpuMs,
+    };
+
+    private void ApplyDarkTheme()
+    {
+        var fig = ScottPlot.Color.FromHex("#22252b");
+        var data = ScottPlot.Color.FromHex("#111217");
+        var text = ScottPlot.Color.FromHex("#9DA5B4");
+        var grid = ScottPlot.Colors.White.WithAlpha(40);
+
+        HistoryChart.Plot.FigureBackground.Color = fig;
+        HistoryChart.Plot.DataBackground.Color = data;
+        HistoryChart.Plot.Axes.Color(text);
+        HistoryChart.Plot.Grid.MajorLineColor = grid;
+        HistoryChart.Plot.Axes.Bottom.TickLabelStyle.ForeColor = text;
+        HistoryChart.Plot.Axes.Left.TickLabelStyle.ForeColor = text;
+        HistoryChart.Plot.Legend.BackgroundColor = fig;
+        HistoryChart.Plot.Legend.FontColor = ScottPlot.Color.FromHex("#E4E6EB");
+        HistoryChart.Plot.Legend.OutlineColor = ScottPlot.Color.FromHex("#3A3D45");
+    }
+
+    private void MetricSelector_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (IsVisible && _historyData.Count > 0)
+            UpdateChart();
+    }
+
+    private async void Refresh_Click(object? sender, RoutedEventArgs e)
+    {
+        await LoadHistoryAsync();
+    }
+
+    private void Close_Click(object? sender, RoutedEventArgs e) => Close();
+}
diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index dc61e5f..1adb87d 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -451,14 +451,14 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
             Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
         };
 
-        humanBtn.Click += (_, _) =>
+        Action showHumanAdvice = () =>
         {
             if (viewer.CurrentPlan == null) return;
             var analysis = ResultMapper.Map(viewer.CurrentPlan, "file", viewer.Metadata);
             ShowAdviceWindow("Advice for Humans", TextFormatter.Format(analysis), analysis);
         };
 
-        robotBtn.Click += (_, _) =>
+        Action showRobotAdvice = () =>
         {
             if (viewer.CurrentPlan == null) return;
             var analysis = ResultMapper.Map(viewer.CurrentPlan, "file", viewer.Metadata);
@@ -466,6 +466,9 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
             ShowAdviceWindow("Advice for Robots", json);
         };
 
+        humanBtn.Click += (_, _) => showHumanAdvice();
+        robotBtn.Click += (_, _) => showRobotAdvice();
+
         var compareBtn = new Button
         {
             Content = "\u2194 Compare Plans",
@@ -500,7 +503,7 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
             Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
         };
 
-        copyReproBtn.Click += async (_, _) =>
+        Func<System.Threading.Tasks.Task> copyRepro = async () =>
         {
             if (viewer.CurrentPlan == null) return;
             var queryText = GetQueryTextFromPlan(viewer);
@@ -518,10 +521,12 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
             }
         };
 
+        copyReproBtn.Click += async (_, _) => await copyRepro();
+
         // Wire up context menu events from PlanViewerControl
-        viewer.HumanAdviceRequested += (_, _) => humanBtn.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
-        viewer.RobotAdviceRequested += (_, _) => robotBtn.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
-        viewer.CopyReproRequested += async (_, _) => copyReproBtn.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+        viewer.HumanAdviceRequested += (_, _) => showHumanAdvice();
+        viewer.RobotAdviceRequested += (_, _) => showRobotAdvice();
+        viewer.CopyReproRequested += async (_, _) => await copyRepro();
 
         var getActualPlanBtn = new Button
         {
diff --git a/src/PlanViewer.App/Mcp/McpHostService.cs b/src/PlanViewer.App/Mcp/McpHostService.cs
index 3e2bbbc..bc66cab 100644
--- a/src/PlanViewer.App/Mcp/McpHostService.cs
+++ b/src/PlanViewer.App/Mcp/McpHostService.cs
@@ -80,9 +80,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             /* Normal shutdown */
         }
-        catch (Exception)
+        catch (Exception ex)
         {
-            /* MCP server failed to start — app continues without it */
+            System.Diagnostics.Debug.WriteLine($"MCP server failed to start: {ex.Message}");
         }
     }
 
diff --git a/src/PlanViewer.App/Mcp/McpQueryStoreTools.cs b/src/PlanViewer.App/Mcp/McpQueryStoreTools.cs
index d37c5bb..22919e9 100644
--- a/src/PlanViewer.App/Mcp/McpQueryStoreTools.cs
+++ b/src/PlanViewer.App/Mcp/McpQueryStoreTools.cs
@@ -6,6 +6,7 @@
 using ModelContextProtocol.Server;
 using PlanViewer.App.Services;
 using PlanViewer.Core.Interfaces;
+using PlanViewer.Core.Models;
 using PlanViewer.Core.Services;
 
 #pragma warning disable CA1707 // Identifiers should not contain underscores (MCP snake_case convention)
@@ -51,7 +52,9 @@ public static async Task<string> CheckQueryStore(
     [Description("Fetches the top N queries from Query Store ranked by the specified metric. " +
         "Uses the application's built-in Query Store query — no arbitrary SQL is executed. " +
         "Each fetched plan is automatically loaded into the application for further analysis " +
-        "with analyze_plan, get_plan_warnings, etc. Returns summary stats and session IDs.")]
+        "with analyze_plan, get_plan_warnings, etc. Returns summary stats and session IDs. " +
+        "Optional filters narrow results server-side by query_id, plan_id, query_hash, " +
+        "plan_hash, or module name (schema.name, supports % wildcards).")]
     public static async Task<string> GetQueryStoreTop(
         PlanSessionManager sessionManager,
         ConnectionStore connectionStore,
@@ -62,7 +65,12 @@ public static async Task<string> GetQueryStoreTop(
         [Description("Ranking metric: cpu, avg-cpu, duration, avg-duration, reads, avg-reads, " +
             "writes, avg-writes, physical-reads, avg-physical-reads, memory, avg-memory, executions. " +
             "Default: cpu.")] string order_by = "cpu",
-        [Description("Hours of history to include. Default 24, max 168.")] int hours_back = 24)
+        [Description("Hours of history to include. Default 24, max 168.")] int hours_back = 24,
+        [Description("Filter by Query Store query ID.")] long? query_id = null,
+        [Description("Filter by Query Store plan ID.")] long? plan_id = null,
+        [Description("Filter by query hash (hex, e.g. 0x1AB2C3D4).")] string? query_hash = null,
+        [Description("Filter by query plan hash (hex, e.g. 0x1AB2C3D4).")] string? plan_hash = null,
+        [Description("Filter by module name (schema.name, supports % wildcards).")] string? module = null)
     {
         try
         {
@@ -76,6 +84,20 @@ public static async Task<string> GetQueryStoreTop(
             if (hours_back < 1 || hours_back > 168)
                 return "Invalid hours_back value. Must be between 1 and 168.";
 
+            QueryStoreFilter? filter = null;
+            if (query_id != null || plan_id != null ||
+                query_hash != null || plan_hash != null || module != null)
+            {
+                filter = new QueryStoreFilter
+                {
+                    QueryId = query_id,
+                    PlanId = plan_id,
+                    QueryHash = query_hash,
+                    QueryPlanHash = plan_hash,
+                    ModuleName = module,
+                };
+            }
+
             var connectionString = conn.GetConnectionString(credentialService, database);
 
             // Check Query Store is enabled first
@@ -85,7 +107,7 @@ public static async Task<string> GetQueryStoreTop(
 
             // Fetch plans using the app's built-in query
             var plans = await QueryStoreService.FetchTopPlansAsync(
-                connectionString, top, order_by, hours_back);
+                connectionString, top, order_by, hours_back, filter);
 
             if (plans.Count == 0)
                 return $"No Query Store data found in [{database}] for the last {hours_back} hours.";
@@ -126,6 +148,9 @@ public static async Task<string> GetQueryStoreTop(
                         session_id = sessionId,
                         query_id = qsPlan.QueryId,
                         plan_id = qsPlan.PlanId,
+                        query_hash = qsPlan.QueryHash,
+                        query_plan_hash = qsPlan.QueryPlanHash,
+                        module_name = string.IsNullOrEmpty(qsPlan.ModuleName) ? (string?)null : qsPlan.ModuleName,
                         label,
                         query_text = McpHelpers.Truncate(qsPlan.QueryText, 500),
                         executions = qsPlan.CountExecutions,
@@ -149,6 +174,9 @@ public static async Task<string> GetQueryStoreTop(
                         session_id = (string)"",
                         query_id = qsPlan.QueryId,
                         plan_id = qsPlan.PlanId,
+                        query_hash = qsPlan.QueryHash,
+                        query_plan_hash = qsPlan.QueryPlanHash,
+                        module_name = string.IsNullOrEmpty(qsPlan.ModuleName) ? (string?)null : qsPlan.ModuleName,
                         label,
                         query_text = McpHelpers.Truncate(qsPlan.QueryText, 500),
                         executions = qsPlan.CountExecutions,
diff --git a/src/PlanViewer.App/PlanViewer.App.csproj b/src/PlanViewer.App/PlanViewer.App.csproj
index 4bdf48c..2a1bc48 100644
--- a/src/PlanViewer.App/PlanViewer.App.csproj
+++ b/src/PlanViewer.App/PlanViewer.App.csproj
@@ -4,8 +4,9 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>EDD.ico</ApplicationIcon>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>
@@ -16,6 +17,7 @@
     <PackageReference Include="Avalonia" Version="11.3.12" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.12" />
+    <PackageReference Include="ScottPlot.Avalonia" Version="5.1.57" />
     <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
diff --git a/src/PlanViewer.Cli/Commands/AnalyzeCommand.cs b/src/PlanViewer.Cli/Commands/AnalyzeCommand.cs
index 004f83c..c522f9d 100644
--- a/src/PlanViewer.Cli/Commands/AnalyzeCommand.cs
+++ b/src/PlanViewer.Cli/Commands/AnalyzeCommand.cs
@@ -10,6 +10,8 @@
 
 namespace PlanViewer.Cli.Commands;
 
+using PlanViewer.Cli;
+
 public static class AnalyzeCommand
 {
     private static readonly JsonSerializerOptions JsonOptions = new()
@@ -142,7 +144,7 @@ public static Command Create(ICredentialService? credentialService = null)
             var analyzerConfig = ConfigLoader.Load(configPath);
 
             // Load .env file if present (CLI args take precedence)
-            var env = LoadEnvFile();
+            var env = ConnectionHelper.LoadEnvFile();
             server ??= env.GetValueOrDefault("PLANVIEW_SERVER");
             database ??= env.GetValueOrDefault("PLANVIEW_DATABASE");
             login ??= env.GetValueOrDefault("PLANVIEW_LOGIN");
@@ -165,45 +167,6 @@ await RunLiveAsync(file, server, database, query, outputDir, estimated,
         return cmd;
     }
 
-    #region .env File Support
-
-    private static Dictionary<string, string> LoadEnvFile()
-    {
-        var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        var envPath = Path.Combine(Directory.GetCurrentDirectory(), ".env");
-
-        if (!File.Exists(envPath))
-            return result;
-
-        foreach (var line in File.ReadAllLines(envPath))
-        {
-            var trimmed = line.Trim();
-            if (string.IsNullOrEmpty(trimmed) || trimmed.StartsWith('#'))
-                continue;
-
-            var eqIndex = trimmed.IndexOf('=');
-            if (eqIndex <= 0)
-                continue;
-
-            var key = trimmed[..eqIndex].Trim();
-            var value = trimmed[(eqIndex + 1)..].Trim();
-
-            // Strip surrounding quotes
-            if (value.Length >= 2 &&
-                ((value.StartsWith('"') && value.EndsWith('"')) ||
-                 (value.StartsWith('\'') && value.EndsWith('\''))))
-            {
-                value = value[1..^1];
-            }
-
-            result[key] = value;
-        }
-
-        return result;
-    }
-
-    #endregion
-
     #region File/Stdin Analysis (existing)
 
     private static async Task RunAsync(FileInfo? file, bool stdin, string output, bool compact, bool warningsOnly, AnalyzerConfig analyzerConfig)
@@ -282,6 +245,13 @@ private static async Task RunLiveAsync(
         ICredentialService? credentialService, string? login, string? password,
         AnalyzerConfig analyzerConfig)
     {
+        if (timeout < 0)
+        {
+            Console.Error.WriteLine("--timeout must be >= 0");
+            Environment.ExitCode = 1;
+            return;
+        }
+
         if (string.IsNullOrEmpty(database))
         {
             Console.Error.WriteLine("--database is required when using --server");
@@ -294,12 +264,21 @@ private static async Task RunLiveAsync(
         if (!string.IsNullOrEmpty(login))
         {
             // Direct login/password — bypass credential store entirely
-            connectionString = BuildDirectConnectionString(server, database, login, password ?? "", trustCert);
+            connectionString = ConnectionHelper.BuildConnectionString(server, database, login, password ?? "", trustCert, multipleActiveResultSets: true);
         }
         else if (credentialService != null)
         {
-            var connection = BuildServerConnection(server, auth, trustCert, credentialService);
-            connectionString = connection.GetConnectionString(credentialService, database);
+            try
+            {
+                var connection = BuildServerConnection(server, auth, trustCert, credentialService);
+                connectionString = connection.GetConnectionString(credentialService, database);
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine(ex.Message);
+                Environment.ExitCode = 1;
+                return;
+            }
         }
         else
         {
@@ -429,16 +408,18 @@ private static async Task RunLiveAsync(
                         stmt.OperatorTree = null;
                 }
 
-                // Write .analysis.json
-                var jsonOpts = compact ? CompactJsonOptions : JsonOptions;
-                var json = JsonSerializer.Serialize(result, jsonOpts);
-                var analysisPath = Path.Combine(outDir, $"{name}.analysis.json");
-                await File.WriteAllTextAsync(analysisPath, json);
+                if (outputFormat == "json" || outputFormat == "both")
+                {
+                    var jsonOpts = compact ? CompactJsonOptions : JsonOptions;
+                    var json = JsonSerializer.Serialize(result, jsonOpts);
+                    var analysisPath = Path.Combine(outDir, $"{name}.analysis.json");
+                    await File.WriteAllTextAsync(analysisPath, json);
+                }
 
-                // Write .analysis.txt (human-readable)
-                var txtPath = Path.Combine(outDir, $"{name}.analysis.txt");
-                using (var writer = new StreamWriter(txtPath))
+                if (outputFormat == "text" || outputFormat == "both")
                 {
+                    var txtPath = Path.Combine(outDir, $"{name}.analysis.txt");
+                    using var writer = new StreamWriter(txtPath);
                     TextFormatter.WriteText(result, writer);
                 }
 
@@ -468,24 +449,6 @@ private static async Task RunLiveAsync(
             Environment.ExitCode = 1;
     }
 
-    private static string BuildDirectConnectionString(
-        string server, string database, string login, string password, bool trustCert)
-    {
-        var builder = new SqlConnectionStringBuilder
-        {
-            DataSource = server,
-            InitialCatalog = database,
-            UserID = login,
-            Password = password,
-            ApplicationName = "PlanViewer",
-            ConnectTimeout = 15,
-            MultipleActiveResultSets = true,
-            TrustServerCertificate = trustCert,
-            Encrypt = trustCert ? SqlConnectionEncryptOption.Optional : SqlConnectionEncryptOption.Mandatory
-        };
-        return builder.ConnectionString;
-    }
-
     private static ServerConnection BuildServerConnection(
         string server, string? auth, bool trustCert, ICredentialService credentialService)
     {
@@ -504,6 +467,7 @@ private static ServerConnection BuildServerConnection(
         {
             Console.Error.WriteLine($"No credential found for {server}. Run: planview credential add {server} --user <username>");
             Environment.ExitCode = 1;
+            throw new InvalidOperationException("No credentials configured");
         }
 
         return new ServerConnection
diff --git a/src/PlanViewer.Cli/Commands/QueryStoreCommand.cs b/src/PlanViewer.Cli/Commands/QueryStoreCommand.cs
index 36dcad8..18ff36b 100644
--- a/src/PlanViewer.Cli/Commands/QueryStoreCommand.cs
+++ b/src/PlanViewer.Cli/Commands/QueryStoreCommand.cs
@@ -8,6 +8,8 @@
 
 namespace PlanViewer.Cli.Commands;
 
+using PlanViewer.Cli;
+
 public static class QueryStoreCommand
 {
     private static readonly JsonSerializerOptions JsonOptions = new()
@@ -72,11 +74,27 @@ public static Command Create(ICredentialService? credentialService = null)
         var passwordOption = new Option<string?>(
             "--password", "SQL Server password");
 
+        var queryIdOption = new Option<long?>(
+            "--query-id", "Filter by Query Store query ID");
+
+        var planIdOption = new Option<long?>(
+            "--plan-id", "Filter by Query Store plan ID");
+
+        var queryHashOption = new Option<string?>(
+            "--query-hash", "Filter by query hash (hex, e.g. 0x1AB2C3D4)");
+
+        var planHashOption = new Option<string?>(
+            "--plan-hash", "Filter by query plan hash (hex, e.g. 0x1AB2C3D4)");
+
+        var moduleOption = new Option<string?>(
+            "--module", "Filter by module name (schema.name, supports % wildcards)");
+
         var cmd = new Command("query-store", "Analyze top queries from Query Store")
         {
             serverOption, databaseOption, topOption, orderByOption, hoursBackOption,
             outputDirOption, outputOption, compactOption, warningsOnlyOption, configOption,
-            authOption, trustCertOption, loginOption, passwordOption
+            authOption, trustCertOption, loginOption, passwordOption,
+            queryIdOption, planIdOption, queryHashOption, planHashOption, moduleOption
         };
 
         cmd.SetHandler(async (ctx) =>
@@ -95,6 +113,46 @@ public static Command Create(ICredentialService? credentialService = null)
             var trustCert = ctx.ParseResult.GetValueForOption(trustCertOption);
             var login = ctx.ParseResult.GetValueForOption(loginOption);
             var password = ctx.ParseResult.GetValueForOption(passwordOption);
+            var filterQueryId = ctx.ParseResult.GetValueForOption(queryIdOption);
+            var filterPlanId = ctx.ParseResult.GetValueForOption(planIdOption);
+            var filterQueryHash = ctx.ParseResult.GetValueForOption(queryHashOption);
+            var filterPlanHash = ctx.ParseResult.GetValueForOption(planHashOption);
+            var filterModule = ctx.ParseResult.GetValueForOption(moduleOption);
+
+            // Load .env file if present (CLI args take precedence)
+            var env = ConnectionHelper.LoadEnvFile();
+            login ??= env.GetValueOrDefault("PLANVIEW_LOGIN");
+            password ??= env.GetValueOrDefault("PLANVIEW_PASSWORD");
+            if (!trustCert && env.GetValueOrDefault("PLANVIEW_TRUST_CERT")?.Equals("true", StringComparison.OrdinalIgnoreCase) == true)
+                trustCert = true;
+
+            if (top < 1)
+            {
+                Console.Error.WriteLine("--top must be >= 1");
+                Environment.ExitCode = 1;
+                return;
+            }
+
+            if (hoursBack < 1)
+            {
+                Console.Error.WriteLine("--hours-back must be >= 1");
+                Environment.ExitCode = 1;
+                return;
+            }
+
+            QueryStoreFilter? filter = null;
+            if (filterQueryId != null || filterPlanId != null ||
+                filterQueryHash != null || filterPlanHash != null || filterModule != null)
+            {
+                filter = new QueryStoreFilter
+                {
+                    QueryId = filterQueryId,
+                    PlanId = filterPlanId,
+                    QueryHash = filterQueryHash,
+                    QueryPlanHash = filterPlanHash,
+                    ModuleName = filterModule,
+                };
+            }
 
             var analyzerConfig = ConfigLoader.Load(configPath);
 
@@ -102,7 +160,7 @@ public static Command Create(ICredentialService? credentialService = null)
             string connectionString;
             if (!string.IsNullOrEmpty(login))
             {
-                connectionString = BuildConnectionString(server, database, login, password ?? "", trustCert);
+                connectionString = ConnectionHelper.BuildConnectionString(server, database, login, password ?? "", trustCert);
             }
             else if (credentialService != null)
             {
@@ -136,7 +194,7 @@ public static Command Create(ICredentialService? credentialService = null)
             try
             {
                 await RunAsync(connectionString, server, database, top, orderBy, hoursBack,
-                    outputDir, output, compact, warningsOnly, analyzerConfig);
+                    outputDir, output, compact, warningsOnly, analyzerConfig, filter);
             }
             catch (SqlException ex)
             {
@@ -157,7 +215,7 @@ private static async Task RunAsync(
         string connectionString, string server, string database,
         int top, string orderBy, int hoursBack,
         DirectoryInfo? outputDir, string outputFormat, bool compact, bool warningsOnly,
-        AnalyzerConfig analyzerConfig)
+        AnalyzerConfig analyzerConfig, QueryStoreFilter? filter = null)
     {
         // Verify Query Store is enabled
         Console.Error.Write($"Checking Query Store on {server}/{database}... ");
@@ -174,7 +232,7 @@ private static async Task RunAsync(
         // Fetch plans
         Console.Error.Write($"Fetching top {top} queries by {orderBy} (last {hoursBack}h)... ");
         var plans = await QueryStoreService.FetchTopPlansAsync(
-            connectionString, top, orderBy, hoursBack);
+            connectionString, top, orderBy, hoursBack, filter);
 
         if (plans.Count == 0)
         {
@@ -195,9 +253,9 @@ private static async Task RunAsync(
         var summaryLines = new List<string>();
         summaryLines.Add($"=== Query Store Analysis: {database} ({plans.Count} queries, top by {orderBy}, last {hoursBack}h) ===");
         summaryLines.Add("");
-        summaryLines.Add(string.Format(" {0,-4} {1,-10} {2,-10} {3,14} {4,12} {5,8} {6,8}",
-            "#", "Query ID", "Plan ID", metricHeader, "Executions", "Warns", "Crit"));
-        summaryLines.Add(new string('-', 78));
+        summaryLines.Add(string.Format(" {0,-4} {1,-10} {2,-10} {3,-20} {4,-20} {5,14} {6,12} {7,8} {8,8}",
+            "#", "Query ID", "Plan ID", "Query Hash", "Module", metricHeader, "Executions", "Warns", "Crit"));
+        summaryLines.Add(new string('-', 130));
 
         for (int i = 0; i < plans.Count; i++)
         {
@@ -242,17 +300,19 @@ private static async Task RunAsync(
                 var critical = result.Summary.CriticalWarnings;
                 var metricValue = metricFmt(qsPlan);
 
-                summaryLines.Add(string.Format(" {0,-4} {1,-10} {2,-10} {3,14} {4,12:N0} {5,8} {6,8}",
-                    i + 1, qsPlan.QueryId, qsPlan.PlanId, metricValue,
-                    qsPlan.CountExecutions, warnings, critical));
+                var moduleName = string.IsNullOrEmpty(qsPlan.ModuleName) ? "(ad hoc)" : qsPlan.ModuleName;
+                summaryLines.Add(string.Format(" {0,-4} {1,-10} {2,-10} {3,-20} {4,-20} {5,14} {6,12:N0} {7,8} {8,8}",
+                    i + 1, qsPlan.QueryId, qsPlan.PlanId, qsPlan.QueryHash,
+                    moduleName.Length > 18 ? moduleName[..18] + ".." : moduleName,
+                    metricValue, qsPlan.CountExecutions, warnings, critical));
 
                 Console.Error.WriteLine($"OK ({warnings} warnings, {critical} critical)");
             }
             catch (Exception ex)
             {
                 Console.Error.WriteLine($"ERROR: {ex.Message}");
-                summaryLines.Add(string.Format(" {0,-4} {1,-10} {2,-10} ERROR: {3}",
-                    i + 1, qsPlan.QueryId, qsPlan.PlanId, ex.Message));
+                summaryLines.Add(string.Format(" {0,-4} {1,-10} {2,-10} {3,-20} {4,-20} ERROR: {5}",
+                    i + 1, qsPlan.QueryId, qsPlan.PlanId, qsPlan.QueryHash, "", ex.Message));
             }
         }
 
@@ -293,20 +353,4 @@ private static (string Header, Func<QueryStorePlan, string> Format) GetMetricFor
         };
     }
 
-    private static string BuildConnectionString(
-        string server, string database, string login, string password, bool trustCert)
-    {
-        var builder = new SqlConnectionStringBuilder
-        {
-            DataSource = server,
-            InitialCatalog = database,
-            UserID = login,
-            Password = password,
-            ApplicationName = "PlanViewer",
-            ConnectTimeout = 15,
-            TrustServerCertificate = trustCert,
-            Encrypt = trustCert ? SqlConnectionEncryptOption.Optional : SqlConnectionEncryptOption.Mandatory
-        };
-        return builder.ConnectionString;
-    }
 }
diff --git a/src/PlanViewer.Cli/ConnectionHelper.cs b/src/PlanViewer.Cli/ConnectionHelper.cs
new file mode 100644
index 0000000..92c6fd2
--- /dev/null
+++ b/src/PlanViewer.Cli/ConnectionHelper.cs
@@ -0,0 +1,63 @@
+using Microsoft.Data.SqlClient;
+
+namespace PlanViewer.Cli;
+
+public static class ConnectionHelper
+{
+    public static string BuildConnectionString(
+        string server, string database, string login, string password,
+        bool trustCert, bool multipleActiveResultSets = false)
+    {
+        var builder = new SqlConnectionStringBuilder
+        {
+            DataSource = server,
+            InitialCatalog = database,
+            UserID = login,
+            Password = password,
+            ApplicationName = "PlanViewer",
+            ConnectTimeout = 15,
+            TrustServerCertificate = trustCert,
+            Encrypt = trustCert ? SqlConnectionEncryptOption.Optional : SqlConnectionEncryptOption.Mandatory
+        };
+
+        if (multipleActiveResultSets)
+            builder.MultipleActiveResultSets = true;
+
+        return builder.ConnectionString;
+    }
+
+    public static Dictionary<string, string> LoadEnvFile()
+    {
+        var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        var envPath = Path.Combine(Directory.GetCurrentDirectory(), ".env");
+
+        if (!File.Exists(envPath))
+            return result;
+
+        foreach (var line in File.ReadAllLines(envPath))
+        {
+            var trimmed = line.Trim();
+            if (string.IsNullOrEmpty(trimmed) || trimmed.StartsWith('#'))
+                continue;
+
+            var eqIndex = trimmed.IndexOf('=');
+            if (eqIndex <= 0)
+                continue;
+
+            var key = trimmed[..eqIndex].Trim();
+            var value = trimmed[(eqIndex + 1)..].Trim();
+
+            // Strip surrounding quotes
+            if (value.Length >= 2 &&
+                ((value.StartsWith('"') && value.EndsWith('"')) ||
+                 (value.StartsWith('\'') && value.EndsWith('\''))))
+            {
+                value = value[1..^1];
+            }
+
+            result[key] = value;
+        }
+
+        return result;
+    }
+}
diff --git a/src/PlanViewer.Cli/PlanViewer.Cli.csproj b/src/PlanViewer.Cli/PlanViewer.Cli.csproj
index c9f97e0..d38fd5d 100644
--- a/src/PlanViewer.Cli/PlanViewer.Cli.csproj
+++ b/src/PlanViewer.Cli/PlanViewer.Cli.csproj
@@ -11,7 +11,7 @@
     <Nullable>enable</Nullable>
     <RootNamespace>PlanViewer.Cli</RootNamespace>
     <AssemblyName>planview</AssemblyName>
-    <Version>1.0.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>
diff --git a/src/PlanViewer.Core/Models/PlanModels.cs b/src/PlanViewer.Core/Models/PlanModels.cs
index 5da92d3..0f15fbd 100644
--- a/src/PlanViewer.Core/Models/PlanModels.cs
+++ b/src/PlanViewer.Core/Models/PlanModels.cs
@@ -6,6 +6,7 @@ namespace PlanViewer.Core.Models;
 public class ParsedPlan
 {
     public string RawXml { get; set; } = "";
+    public string? ParseError { get; set; }
     public string? BuildVersion { get; set; }
     public string? Build { get; set; }
     public bool ClusteredMode { get; set; }
diff --git a/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs b/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs
new file mode 100644
index 0000000..f2b691f
--- /dev/null
+++ b/src/PlanViewer.Core/Models/QueryStoreHistoryRow.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace PlanViewer.Core.Models;
+
+public class QueryStoreHistoryRow
+{
+    public long PlanId { get; set; }
+    public string QueryPlanHash { get; set; } = "";
+    public DateTime IntervalStartUtc { get; set; }
+    public long CountExecutions { get; set; }
+
+    public double AvgDurationMs { get; set; }
+    public double AvgCpuMs { get; set; }
+    public double AvgLogicalReads { get; set; }
+    public double AvgLogicalWrites { get; set; }
+    public double AvgPhysicalReads { get; set; }
+    public double AvgMemoryMb { get; set; }
+    public double AvgRowcount { get; set; }
+
+    public double TotalDurationMs { get; set; }
+    public double TotalCpuMs { get; set; }
+    public double TotalLogicalReads { get; set; }
+    public double TotalLogicalWrites { get; set; }
+    public double TotalPhysicalReads { get; set; }
+
+    public int MinDop { get; set; }
+    public int MaxDop { get; set; }
+    public DateTime? LastExecutionUtc { get; set; }
+
+    public string IntervalStartLocal => IntervalStartUtc.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
+    public string LastExecutionLocal => LastExecutionUtc?.ToLocalTime().ToString("yyyy-MM-dd HH:mm") ?? "";
+}
diff --git a/src/PlanViewer.Core/Models/QueryStorePlan.cs b/src/PlanViewer.Core/Models/QueryStorePlan.cs
index f3286a0..4f24ce6 100644
--- a/src/PlanViewer.Core/Models/QueryStorePlan.cs
+++ b/src/PlanViewer.Core/Models/QueryStorePlan.cs
@@ -2,10 +2,26 @@
 
 namespace PlanViewer.Core.Models;
 
+/// <summary>
+/// Server-side search filter for Query Store fetches.
+/// All properties are optional — only non-null values generate WHERE clauses.
+/// </summary>
+public class QueryStoreFilter
+{
+    public long? QueryId { get; set; }
+    public long? PlanId { get; set; }
+    public string? QueryHash { get; set; }
+    public string? QueryPlanHash { get; set; }
+    public string? ModuleName { get; set; }
+}
+
 public class QueryStorePlan
 {
     public long QueryId { get; set; }
     public long PlanId { get; set; }
+    public string QueryHash { get; set; } = "";
+    public string QueryPlanHash { get; set; } = "";
+    public string ModuleName { get; set; } = "";
     public string QueryText { get; set; } = "";
     public string PlanXml { get; set; } = "";
 
diff --git a/src/PlanViewer.Core/Models/ServerConnection.cs b/src/PlanViewer.Core/Models/ServerConnection.cs
index ce3bfd8..c8eae29 100644
--- a/src/PlanViewer.Core/Models/ServerConnection.cs
+++ b/src/PlanViewer.Core/Models/ServerConnection.cs
@@ -57,11 +57,11 @@ public string GetConnectionString(ICredentialService credentialService, string?
 
             case AuthenticationTypes.SqlServer:
                 var cred = credentialService.GetCredential(Id);
-                if (cred.HasValue)
-                {
-                    builder.UserID = cred.Value.Username;
-                    builder.Password = cred.Value.Password;
-                }
+                if (!cred.HasValue)
+                    throw new InvalidOperationException(
+                        $"SQL Server authentication credentials are missing for server '{ServerName}'. Please configure credentials before connecting.");
+                builder.UserID = cred.Value.Username;
+                builder.Password = cred.Value.Password;
                 break;
 
             default: // Windows
diff --git a/src/PlanViewer.Core/PlanViewer.Core.csproj b/src/PlanViewer.Core/PlanViewer.Core.csproj
index f2facfe..3eab7bb 100644
--- a/src/PlanViewer.Core/PlanViewer.Core.csproj
+++ b/src/PlanViewer.Core/PlanViewer.Core.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>PlanViewer.Core</RootNamespace>
-    <Version>0.7.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>SQL Performance Studio</Product>
diff --git a/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs b/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs
index fa58da8..874f951 100644
--- a/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs
+++ b/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs
@@ -85,7 +85,9 @@ internal static string MergeShowPlanXmls(List<string> planXmls)
     {
         XNamespace ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
         var baseDoc = XDocument.Parse(planXmls[0]);
-        var batchSequence = baseDoc.Root!.Element(ns + "BatchSequence")!;
+        var batchSequence = baseDoc.Root!.Element(ns + "BatchSequence");
+        if (batchSequence == null)
+            return planXmls[0];
 
         for (int i = 1; i < planXmls.Count; i++)
         {
diff --git a/src/PlanViewer.Core/Services/KeychainCredentialService.cs b/src/PlanViewer.Core/Services/KeychainCredentialService.cs
index b2c393f..4e1f9cb 100644
--- a/src/PlanViewer.Core/Services/KeychainCredentialService.cs
+++ b/src/PlanViewer.Core/Services/KeychainCredentialService.cs
@@ -103,9 +103,10 @@ private static (int ExitCode, string Output) RunSecurity(params string[] args)
         using var process = Process.Start(psi);
         if (process == null) return (-1, string.Empty);
 
-        var stdout = process.StandardOutput.ReadToEnd();
+        var stdoutTask = process.StandardOutput.ReadToEndAsync();
         var stderr = process.StandardError.ReadToEnd();
         process.WaitForExit();
+        var stdout = stdoutTask.Result;
 
         return (process.ExitCode, stdout + stderr);
     }
diff --git a/src/PlanViewer.Core/Services/PlanAnalyzer.cs b/src/PlanViewer.Core/Services/PlanAnalyzer.cs
index f16e976..0d577b3 100644
--- a/src/PlanViewer.Core/Services/PlanAnalyzer.cs
+++ b/src/PlanViewer.Core/Services/PlanAnalyzer.cs
@@ -388,7 +388,7 @@ private static void AnalyzeStatement(PlanStatement stmt, AnalyzerConfig cfg)
             var modifiesTableVar = false;
             CheckForTableVariables(stmt.RootNode, isModification, ref hasTableVar, ref modifiesTableVar);
 
-            if (hasTableVar)
+            if (hasTableVar && !modifiesTableVar)
             {
                 stmt.PlanWarnings.Add(new PlanWarning
                 {
@@ -865,11 +865,17 @@ _ when nonSargableReason.StartsWith("Function call") =>
         if (!cfg.IsRuleDisabled(22) && !string.IsNullOrEmpty(node.ObjectName) &&
             node.ObjectName.StartsWith("@"))
         {
+            var isModificationOp = node.PhysicalOp.Contains("Insert", StringComparison.OrdinalIgnoreCase)
+                || node.PhysicalOp.Contains("Update", StringComparison.OrdinalIgnoreCase)
+                || node.PhysicalOp.Contains("Delete", StringComparison.OrdinalIgnoreCase);
+
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Table Variable",
-                Message = "Table variable detected. Table variables lack column-level statistics, which causes bad row estimates, join choices, and memory grant decisions. Replace with a #temp table.",
-                Severity = PlanWarningSeverity.Warning
+                Message = isModificationOp
+                    ? "Modifying a table variable forces the entire plan to run single-threaded. Replace with a #temp table to allow parallel execution."
+                    : "Table variable detected. Table variables lack column-level statistics, which causes bad row estimates, join choices, and memory grant decisions. Replace with a #temp table.",
+                Severity = isModificationOp ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
             });
         }
 
diff --git a/src/PlanViewer.Core/Services/QueryStoreService.cs b/src/PlanViewer.Core/Services/QueryStoreService.cs
index a7e8e44..b435d92 100644
--- a/src/PlanViewer.Core/Services/QueryStoreService.cs
+++ b/src/PlanViewer.Core/Services/QueryStoreService.cs
@@ -39,10 +39,13 @@ public static class QueryStoreService
     /// Plans are estimated plans from the plan cache — Query Store does not store actual execution plans.
     /// Supported orderBy values: cpu, avg-cpu, duration, avg-duration, reads, avg-reads,
     /// writes, avg-writes, physical-reads, avg-physical-reads, memory, avg-memory, executions.
+    /// Optional filter narrows results server-side by query_id, plan_id, query_hash,
+    /// query_plan_hash, or module name (schema.name, supports % wildcards).
     /// </summary>
     public static async Task<List<QueryStorePlan>> FetchTopPlansAsync(
         string connectionString, int topN = 25, string orderBy = "cpu",
-        int hoursBack = 24, CancellationToken ct = default)
+        int hoursBack = 24, QueryStoreFilter? filter = null,
+        CancellationToken ct = default)
     {
         var key = orderBy.ToLowerInvariant();
 
@@ -80,11 +83,56 @@ public static async Task<List<QueryStorePlan>> FetchTopPlansAsync(
             _ => "r.total_cpu_us"
         };
 
+        // Build optional WHERE clauses from filter (parameterized for safety).
+        var filterClauses = new List<string>();
+        var parameters = new List<SqlParameter>();
+
+        if (filter?.QueryId != null)
+        {
+            filterClauses.Add("AND q.query_id = @filterQueryId");
+            parameters.Add(new SqlParameter("@filterQueryId", filter.QueryId.Value));
+        }
+        if (filter?.PlanId != null)
+        {
+            filterClauses.Add("AND r.plan_id = @filterPlanId");
+            parameters.Add(new SqlParameter("@filterPlanId", filter.PlanId.Value));
+        }
+        if (!string.IsNullOrWhiteSpace(filter?.QueryHash))
+        {
+            filterClauses.Add("AND q.query_hash = CONVERT(binary(8), @filterQueryHash, 1)");
+            parameters.Add(new SqlParameter("@filterQueryHash", filter.QueryHash.Trim()));
+        }
+        if (!string.IsNullOrWhiteSpace(filter?.QueryPlanHash))
+        {
+            filterClauses.Add("AND p.query_plan_hash = CONVERT(binary(8), @filterPlanHash, 1)");
+            parameters.Add(new SqlParameter("@filterPlanHash", filter.QueryPlanHash.Trim()));
+        }
+        if (!string.IsNullOrWhiteSpace(filter?.ModuleName))
+        {
+            // Support wildcards (%) like sp_QuickieStore. If no wildcard, exact match.
+            var moduleVal = filter.ModuleName.Trim();
+            if (moduleVal.Contains('%'))
+            {
+                filterClauses.Add("AND OBJECT_SCHEMA_NAME(q.object_id) + N'.' + OBJECT_NAME(q.object_id) LIKE @filterModule");
+            }
+            else
+            {
+                filterClauses.Add("AND OBJECT_SCHEMA_NAME(q.object_id) + N'.' + OBJECT_NAME(q.object_id) = @filterModule");
+            }
+            parameters.Add(new SqlParameter("@filterModule", moduleVal));
+        }
+
+        var rnClause = filter?.PlanId != null ? "" : "AND r.rn = 1";
+        var filterSql = filterClauses.Count > 0
+            ? "\n" + string.Join("\n", filterClauses)
+            : "";
+
         // 1. plan_agg: aggregate runtime_stats by plan_id only (cheapest grouping,
         //    avoids joining query_text for the entire dataset).
         // 2. ranked: join the small aggregated result to plan to get query_id,
         //    ROW_NUMBER to pick best plan per query.
         // 3. Final SELECT: TOP N, then join query_text + plan XML only for winners.
+        //    Filter clauses applied here where q/p are available.
         var sql = $@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
@@ -150,12 +198,19 @@ SELECT TOP ({topN})
     CAST(r.total_writes AS bigint),
     CAST(r.total_physical_reads AS bigint),
     CAST(r.total_memory_pages AS bigint),
-    r.last_execution_time
+    r.last_execution_time,
+    CONVERT(varchar(18), q.query_hash, 1),
+    CONVERT(varchar(18), p.query_plan_hash, 1),
+    CASE
+        WHEN q.object_id <> 0
+        THEN OBJECT_SCHEMA_NAME(q.object_id) + N'.' + OBJECT_NAME(q.object_id)
+        ELSE N''
+    END
 FROM ranked r
 JOIN sys.query_store_plan p ON r.plan_id = p.plan_id
 JOIN sys.query_store_query q ON p.query_id = q.query_id
 JOIN sys.query_store_query_text qt ON q.query_text_id = qt.query_text_id
-WHERE r.rn = 1
+WHERE 1 = 1 {rnClause}{filterSql}
 ORDER BY {outerOrder} DESC
 OPTION (LOOP JOIN);";
 
@@ -164,6 +219,8 @@ ORDER BY {outerOrder} DESC
         await using var conn = new SqlConnection(connectionString);
         await conn.OpenAsync(ct);
         await using var cmd = new SqlCommand(sql, conn) { CommandTimeout = 120 };
+        foreach (var p in parameters)
+            cmd.Parameters.Add(p);
         await using var reader = await cmd.ExecuteReaderAsync(ct);
 
         while (await reader.ReadAsync(ct))
@@ -191,10 +248,102 @@ ORDER BY {outerOrder} DESC
                 TotalLogicalIoWrites = reader.GetInt64(14),
                 TotalPhysicalIoReads = reader.GetInt64(15),
                 TotalMemoryGrantPages = reader.GetInt64(16),
-                LastExecutedUtc = ((DateTimeOffset)reader.GetValue(17)).UtcDateTime
+                LastExecutedUtc = ((DateTimeOffset)reader.GetValue(17)).UtcDateTime,
+                QueryHash = reader.IsDBNull(18) ? "" : reader.GetString(18),
+                QueryPlanHash = reader.IsDBNull(19) ? "" : reader.GetString(19),
+                ModuleName = reader.IsDBNull(20) ? "" : reader.GetString(20),
             });
         }
 
         return plans;
     }
+
+    public static async Task<List<QueryStoreHistoryRow>> FetchHistoryAsync(
+        string connectionString, long queryId, int hoursBack = 24,
+        CancellationToken ct = default)
+    {
+        const string sql = @"
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+SELECT
+    p.plan_id,
+    CONVERT(varchar(18), MAX(p.query_plan_hash), 1),
+    rsi.start_time,
+    SUM(rs.count_executions),
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_duration * rs.count_executions) / SUM(rs.count_executions) / 1000.0
+         ELSE 0 END,
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_cpu_time * rs.count_executions) / SUM(rs.count_executions) / 1000.0
+         ELSE 0 END,
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_logical_io_reads * rs.count_executions) / SUM(rs.count_executions)
+         ELSE 0 END,
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_logical_io_writes * rs.count_executions) / SUM(rs.count_executions)
+         ELSE 0 END,
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_physical_io_reads * rs.count_executions) / SUM(rs.count_executions)
+         ELSE 0 END,
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_query_max_used_memory * rs.count_executions) / SUM(rs.count_executions) * 8.0 / 1024.0
+         ELSE 0 END,
+    CASE WHEN SUM(rs.count_executions) > 0
+         THEN SUM(rs.avg_rowcount * rs.count_executions) / SUM(rs.count_executions)
+         ELSE 0 END,
+    SUM(rs.avg_duration * rs.count_executions) / 1000.0,
+    SUM(rs.avg_cpu_time * rs.count_executions) / 1000.0,
+    SUM(rs.avg_logical_io_reads * rs.count_executions),
+    SUM(rs.avg_logical_io_writes * rs.count_executions),
+    SUM(rs.avg_physical_io_reads * rs.count_executions),
+    MIN(rs.min_dop),
+    MAX(rs.max_dop),
+    MAX(rs.last_execution_time)
+FROM sys.query_store_runtime_stats rs
+JOIN sys.query_store_runtime_stats_interval rsi
+    ON rs.runtime_stats_interval_id = rsi.runtime_stats_interval_id
+JOIN sys.query_store_plan p
+    ON rs.plan_id = p.plan_id
+WHERE p.query_id = @queryId
+AND   rsi.start_time >= DATEADD(HOUR, -@hoursBack, GETUTCDATE())
+GROUP BY p.plan_id, rsi.start_time
+ORDER BY rsi.start_time, p.plan_id;";
+
+        var rows = new List<QueryStoreHistoryRow>();
+
+        await using var conn = new SqlConnection(connectionString);
+        await conn.OpenAsync(ct);
+        await using var cmd = new SqlCommand(sql, conn) { CommandTimeout = 120 };
+        cmd.Parameters.Add(new SqlParameter("@queryId", queryId));
+        cmd.Parameters.Add(new SqlParameter("@hoursBack", hoursBack));
+        await using var reader = await cmd.ExecuteReaderAsync(ct);
+
+        while (await reader.ReadAsync(ct))
+        {
+            rows.Add(new QueryStoreHistoryRow
+            {
+                PlanId = reader.GetInt64(0),
+                QueryPlanHash = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                IntervalStartUtc = ((DateTimeOffset)reader.GetValue(2)).UtcDateTime,
+                CountExecutions = reader.GetInt64(3),
+                AvgDurationMs = reader.GetDouble(4),
+                AvgCpuMs = reader.GetDouble(5),
+                AvgLogicalReads = reader.GetDouble(6),
+                AvgLogicalWrites = reader.GetDouble(7),
+                AvgPhysicalReads = reader.GetDouble(8),
+                AvgMemoryMb = reader.GetDouble(9),
+                AvgRowcount = reader.GetDouble(10),
+                TotalDurationMs = reader.GetDouble(11),
+                TotalCpuMs = reader.GetDouble(12),
+                TotalLogicalReads = reader.GetDouble(13),
+                TotalLogicalWrites = reader.GetDouble(14),
+                TotalPhysicalReads = reader.GetDouble(15),
+                MinDop = (int)reader.GetInt64(16),
+                MaxDop = (int)reader.GetInt64(17),
+                LastExecutionUtc = reader.IsDBNull(18) ? null : ((DateTimeOffset)reader.GetValue(18)).UtcDateTime,
+            });
+        }
+
+        return rows;
+    }
 }
diff --git a/src/PlanViewer.Core/Services/ServerMetadataService.cs b/src/PlanViewer.Core/Services/ServerMetadataService.cs
index 516fa1d..1851224 100644
--- a/src/PlanViewer.Core/Services/ServerMetadataService.cs
+++ b/src/PlanViewer.Core/Services/ServerMetadataService.cs
@@ -55,9 +55,9 @@ public static async Task<ServerMetadata> FetchServerMetadataAsync(
         await using var conn = new SqlConnection(connectionString);
         await conn.OpenAsync(cancellationToken);
 
-        using var cmd = new SqlCommand(ServerMetadataQuery, conn);
+        await using var cmd = new SqlCommand(ServerMetadataQuery, conn);
         cmd.CommandTimeout = 10;
-        using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+        await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 
         // Result set 1: server properties
         if (await reader.ReadAsync(cancellationToken))
@@ -116,9 +116,9 @@ public static async Task<DatabaseMetadata> FetchDatabaseMetadataAsync(
         await using var conn = new SqlConnection(connectionString);
         await conn.OpenAsync(cancellationToken);
 
-        using var cmd = new SqlCommand(query, conn);
+        await using var cmd = new SqlCommand(query, conn);
         cmd.CommandTimeout = 10;
-        using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+        await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 
         // Result set 1: sys.databases
         if (await reader.ReadAsync(cancellationToken))
diff --git a/src/PlanViewer.Core/Services/ShowPlanParser.cs b/src/PlanViewer.Core/Services/ShowPlanParser.cs
index 01bfcd8..637df45 100644
--- a/src/PlanViewer.Core/Services/ShowPlanParser.cs
+++ b/src/PlanViewer.Core/Services/ShowPlanParser.cs
@@ -20,8 +20,9 @@ public static ParsedPlan Parse(string xml)
         {
             doc = XDocument.Parse(xml);
         }
-        catch
+        catch (Exception ex)
         {
+            plan.ParseError = ex.Message;
             return plan;
         }
 
@@ -409,7 +410,7 @@ private static void ParseQueryPlanElements(PlanStatement stmt, XElement stmtEl,
         stmt.CachedPlanSizeKB = ParseLong(queryPlanEl.Attribute("CachedPlanSize")?.Value);
         stmt.DegreeOfParallelism = (int)ParseDouble(queryPlanEl.Attribute("DegreeOfParallelism")?.Value);
         stmt.NonParallelPlanReason = queryPlanEl.Attribute("NonParallelPlanReason")?.Value;
-        stmt.RetrievedFromCache = queryPlanEl.Attribute("RetrievedFromCache")?.Value is "true" or "1";
+        stmt.RetrievedFromCache = stmtEl.Attribute("RetrievedFromCache")?.Value is "true" or "1";
         stmt.CompileTimeMs = ParseLong(queryPlanEl.Attribute("CompileTime")?.Value);
         stmt.CompileMemoryKB = ParseLong(queryPlanEl.Attribute("CompileMemory")?.Value);
         stmt.CompileCPUMs = ParseLong(queryPlanEl.Attribute("CompileCPU")?.Value);
diff --git a/src/PlanViewer.Ssms.Installer/PlanViewer.Ssms.Installer.csproj b/src/PlanViewer.Ssms.Installer/PlanViewer.Ssms.Installer.csproj
index 56cc63c..8d607d5 100644
--- a/src/PlanViewer.Ssms.Installer/PlanViewer.Ssms.Installer.csproj
+++ b/src/PlanViewer.Ssms.Installer/PlanViewer.Ssms.Installer.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>InstallSsmsExtension</AssemblyName>
     <RootNamespace>PlanViewer.Ssms.Installer</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>0.5.0</Version>
+    <Version>1.2.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>SQL Performance Studio</Product>