diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 440d6855..b5936c08 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,9 +5,11 @@ A clear description of the change and why it's being made.
 ## Which component(s) does this affect?
 
 - [ ] Full Dashboard
-- [ ] Lite
+- [ ] Lite Dashboard
+- [ ] Lite Tests
 - [ ] SQL collection scripts
-- [ ] Installer
+- [ ] CLI Installer
+- [ ] GUI Installer
 - [ ] Documentation
 
 ## How was this tested?
diff --git a/.github/sql/ci_validate_installation.sql b/.github/sql/ci_validate_installation.sql
index 77187200..0761f80a 100644
--- a/.github/sql/ci_validate_installation.sql
+++ b/.github/sql/ci_validate_installation.sql
@@ -30,7 +30,7 @@ IF SCHEMA_ID(N'report')  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: sche
 PRINT '';
 
 /*
-Procedures in collect schema (37)
+Procedures in collect schema (36)
 */
 PRINT 'Checking collect procedures...';
 
@@ -65,7 +65,6 @@ IF OBJECT_ID(N'collect.tempdb_stats_collector', N'P')           IS NULL BEGIN SE
 IF OBJECT_ID(N'collect.plan_cache_stats_collector', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.plan_cache_stats_collector'; END;       SET @checked += 1;
 IF OBJECT_ID(N'collect.session_stats_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.session_stats_collector'; END;          SET @checked += 1;
 IF OBJECT_ID(N'collect.waiting_tasks_collector', N'P')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.waiting_tasks_collector'; END;          SET @checked += 1;
-IF OBJECT_ID(N'collect.session_wait_stats_collector', N'P')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.session_wait_stats_collector'; END;     SET @checked += 1;
 IF OBJECT_ID(N'collect.server_configuration_collector', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.server_configuration_collector'; END;   SET @checked += 1;
 IF OBJECT_ID(N'collect.database_configuration_collector', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.database_configuration_collector'; END; SET @checked += 1;
 IF OBJECT_ID(N'collect.configuration_issues_analyzer', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.configuration_issues_analyzer'; END;    SET @checked += 1;
@@ -142,7 +141,6 @@ IF OBJECT_ID(N'report.blocking_chain_analysis', N'V')             IS NULL BEGIN
 IF OBJECT_ID(N'report.tempdb_contention_analysis', N'V')          IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.tempdb_contention_analysis'; END;          SET @checked += 1;
 IF OBJECT_ID(N'report.parameter_sensitivity_detection', N'V')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.parameter_sensitivity_detection'; END;     SET @checked += 1;
 IF OBJECT_ID(N'report.scheduler_cpu_analysis', N'V')              IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.scheduler_cpu_analysis'; END;              SET @checked += 1;
-IF OBJECT_ID(N'report.session_wait_analysis', N'V')               IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.session_wait_analysis'; END;               SET @checked += 1;
 IF OBJECT_ID(N'report.critical_issues', N'V')                     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.critical_issues'; END;                     SET @checked += 1;
 IF OBJECT_ID(N'report.memory_usage_trends', N'V')                 IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.memory_usage_trends'; END;                 SET @checked += 1;
 IF OBJECT_ID(N'report.running_jobs', N'V')                        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.running_jobs'; END;                        SET @checked += 1;
@@ -182,7 +180,7 @@ WHERE OBJECT_SCHEMA_NAME(t.object_id) = N'config';
 PRINT '  collect schema tables: ' + CONVERT(varchar(10), @collect_tables);
 PRINT '  config schema tables: ' + CONVERT(varchar(10), @config_tables);
 
-IF @collect_tables < 20 BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 20 collect tables, found ' + CONVERT(varchar(10), @collect_tables); END; SET @checked += 1;
+IF @collect_tables < 19 BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 20 collect tables, found ' + CONVERT(varchar(10), @collect_tables); END; SET @checked += 1;
 IF @config_tables < 5  BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 5 config tables, found ' + CONVERT(varchar(10), @config_tables); END;  SET @checked += 1;
 
 PRINT '';
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d33ee270..e7ba32d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
         run: dotnet publish Installer/PerformanceMonitorInstaller.csproj -c Release
 
       - name: Publish GUI Installer
-        run: dotnet publish InstallerGui/InstallerGui.csproj -c Release -r win-x64 --self-contained
+        run: dotnet publish InstallerGui/InstallerGui.csproj -c Release
 
       - name: Package release artifacts
         if: github.event_name == 'release'
@@ -69,7 +69,7 @@ jobs:
           New-Item -ItemType Directory -Force -Path "$instDir/upgrades"
 
           Copy-Item 'Installer/bin/Release/net8.0/win-x64/publish/PerformanceMonitorInstaller.exe' $instDir
-          Copy-Item 'InstallerGui/bin/Release/net8.0-windows/win-x64/publish/InstallerGui.exe' $instDir -ErrorAction SilentlyContinue
+          Copy-Item 'InstallerGui/bin/Release/net8.0-windows/win-x64/publish/PerformanceMonitorInstallerGui.exe' $instDir -ErrorAction SilentlyContinue
           Copy-Item 'install/*.sql' "$instDir/install/"
           if (Test-Path 'upgrades') { Copy-Item 'upgrades/*' "$instDir/upgrades/" -Recurse -ErrorAction SilentlyContinue }
           if (Test-Path 'README.md') { Copy-Item 'README.md' $instDir }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f999e77..f10f250d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,67 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2026-02-25
+
+### Important
+
+- **Schema upgrade**: The `collect.memory_grant_stats` table gains new delta columns and drops unused warning columns. The `collect.session_wait_stats` table, its collector procedure, reporting view, and schedule entry are removed (zero UI coverage). Upgrade scripts run automatically via the CLI/GUI installer and use idempotent checks.
+
+### Added
+
+- **Graphical query plan viewer** — native ShowPlan rendering in both Dashboard and Lite with SSMS-parity operator icons, properties panel, tooltips, warning/parallelism badges, and tabbed plan display ([#220])
+- **Actual execution plan support** — execute queries with SET STATISTICS XML ON to capture actual plans, with loading indicator and confirmation dialog ([#233])
+- **PlanAnalyzer** — automated plan analysis with rules for missing indexes, eager spools, key lookups, implicit conversions, memory grants, and more
+- **Current Active Queries live snapshot** — real-time view of running queries with estimated/live plan download ([#149])
+- **Memory clerks tab** in Lite with picker-driven chart ([#145])
+- **Current Waits charts** in Blocking tab for both Dashboard and Lite ([#280])
+- **File I/O throughput charts** — read/write throughput trends, file-level latency breakdown, queued I/O overlay ([#281])
+- **Memory grant stats charts** — standardized collection with delta framework integration and trend visualization ([#281])
+- **CPU scheduler pressure status** — real-time scheduler, worker, runnable task counts with color-coded pressure level below CPU chart
+- **Collection log drill-down** and daily summary in Lite ([#138])
+- **Collector duration trends chart** in Dashboard Collection Health ([#138])
+- **Themed perfmon counter packs** — 14 new counters with organized themed groups ([#255])
+- **User-configurable connection timeout** setting ([#236])
+- **Per-collector retention** — uses per-collector retention from `config.collection_schedule` in data retention ([#237])
+- **Query identifiers** in drill-down windows — query hash, plan hash, SQL handle visible for identification ([#268])
+- **Trace pattern drill-down** with missing columns and query text tooltips ([#273])
+- **Query Store Regressions drill-down** with TVF rewrite for performance ([#274])
+- **CLI `--help` flag** for installer ([#111])
+- Sort arrows, right-aligned numerics, and initial sort indicators across all grids ([#110])
+- Copyable plan viewer properties ([#269])
+- Standardized chart save/export filenames between Dashboard and Lite ([#284])
+- Full Dashboard column parity for query_stats, procedure_stats, and query_store_stats
+- Min/max extremes surfaced in both apps — physical reads, rows, grant KB, spills, CLR time, log bytes ([#281])
+
+### Changed
+
+- Query Store detection uses `sys.database_query_store_options` instead of `sys.databases.is_query_store_on` for Azure SQL DB compatibility ([#287])
+- Config tab consolidation, DB drop on server remove, DuckDB-first plan lookups, procedure stats parity
+- Collector health status now detects consecutive recent failures — 5+ consecutive errors = FAILING, 3+ = WARNING
+- Plan buttons now show a MessageBox when no plan is available instead of silently doing nothing
+- CSV export uses locale-appropriate separators for non-US locales ([#240])
+- Query Store Regressions and Query Trace Patterns migrated to popup grid filtering ([#260])
+- NuGet packages updated; xUnit v3 migration
+
+### Fixed
+
+- **DuckDB file corruption** during maintenance — ReaderWriterLockSlim coordination, archive-all-and-reset at 512MB replaces compaction ([#218])
+- Archive view column mismatch, wait_stats thread-safety, and percent_complete type cast ([#234])
+- Collector health status bar text color ([#234])
+- View Plan for Query Store and Query Store Regressions tabs ([#261])
+- Query Store drill-down time filter alignment with main view ([#263])
+- Execution count mismatches between main views and drill-downs
+- Drill-down chart UX — sparse data markers, hover tooltips, window sizing ([#271])
+- Truncated status text in Add Server dialog ([#257])
+- Scrollbar visibility, self-filtering artifacts, missing columns, and context menus ([#245], [#246], [#247], [#248])
+- query_stats and procedure_stats collectors ignoring recent queries
+- Blank tooltips on warning and parallel badge icons
+- Missing chart context menu on File I/O Throughput charts in Lite
+
+### Removed
+
+- `collect.session_wait_stats` table, `collect.session_wait_stats_collector` procedure, `report.session_wait_analysis` view, and schedule entry — zero UI coverage, never surfaced in Dashboard or Lite ([#281])
+
 ## [1.3.0] - 2026-02-20
 
 ### Important
@@ -119,6 +180,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Delta normalization for per-second rate calculations
 - Dark theme UI
 
+[2.0.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.3.0...v2.0.0
 [1.3.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/erikdarlingdata/PerformanceMonitor/compare/v1.0.0...v1.1.0
@@ -187,3 +249,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#206]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/206
 [#210]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/210
 [#214]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/214
+[#218]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/218
+[#220]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/220
+[#233]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/233
+[#234]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/234
+[#236]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/236
+[#237]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/237
+[#240]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/240
+[#245]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/245
+[#246]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/246
+[#247]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/247
+[#248]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/248
+[#255]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/255
+[#257]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/257
+[#260]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/260
+[#261]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/261
+[#263]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/263
+[#268]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/268
+[#269]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/269
+[#271]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/271
+[#273]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/273
+[#274]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/274
+[#280]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/280
+[#281]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/281
+[#284]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/284
+[#287]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/287
diff --git a/Dashboard/CollectionLogWindow.xaml b/Dashboard/CollectionLogWindow.xaml
index 7fb2e45a..32a75576 100644
--- a/Dashboard/CollectionLogWindow.xaml
+++ b/Dashboard/CollectionLogWindow.xaml
@@ -6,6 +6,15 @@
         Title="Collection History" Height="600" Width="1000"
         WindowStartupLocation="CenterOwner"
         Background="{DynamicResource BackgroundBrush}">
+    <Window.Resources>
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+            <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+            <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+            <Separator/>
+            <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+        </ContextMenu>
+    </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -28,7 +37,8 @@
                   CanUserSortColumns="True"
                   AlternatingRowBackground="{DynamicResource BackgroundLightBrush}"
                   GridLinesVisibility="All"
-                  Margin="10">
+                  Margin="10"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
                     <DataGridTextColumn.Header>
@@ -46,7 +56,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding RowsCollected}" Width="120">
+                <DataGridTextColumn Binding="{Binding RowsCollected}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button x:Name="RowsCollectedFilterButton" Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RowsCollected" Click="LogFilter_Click" Margin="0,0,4,0"/>
@@ -54,7 +64,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding DurationMs, StringFormat='{}{0:N0}'}" Width="110">
+                <DataGridTextColumn Binding="{Binding DurationMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button x:Name="DurationFilterButton" Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DurationMs" Click="LogFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/CollectionLogWindow.xaml.cs b/Dashboard/CollectionLogWindow.xaml.cs
index 4ebd6e6f..85076ead 100644
--- a/Dashboard/CollectionLogWindow.xaml.cs
+++ b/Dashboard/CollectionLogWindow.xaml.cs
@@ -189,6 +189,80 @@ private void UpdateLogFilterButtonStyles()
             }
         }
 
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = Helpers.TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(Helpers.TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new System.Text.StringBuilder();
+                    var headers = new List<string>();
+                    foreach (var column in dataGrid.Columns)
+                        headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
+                    sb.AppendLine(string.Join("\t", headers));
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(Helpers.TabHelpers.GetRowAsText(dataGrid, item));
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var dialog = new Microsoft.Win32.SaveFileDialog
+                    {
+                        FileName = $"collection_log_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+                    if (dialog.ShowDialog() == true)
+                    {
+                        var sb = new System.Text.StringBuilder();
+                        var headers = new List<string>();
+                        foreach (var column in dataGrid.Columns)
+                            headers.Add(Helpers.TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
+                        sb.AppendLine(string.Join(",", headers));
+                        foreach (var item in dataGrid.Items)
+                        {
+                            var values = Helpers.TabHelpers.GetRowValues(dataGrid, item);
+                            sb.AppendLine(string.Join(",", values.Select(v => Helpers.TabHelpers.EscapeCsvField(v))));
+                        }
+                        System.IO.File.WriteAllText(dialog.FileName, sb.ToString());
+                    }
+                }
+            }
+        }
+
         private void Close_Click(object sender, RoutedEventArgs e)
         {
             Close();
diff --git a/Dashboard/CollectorScheduleWindow.xaml b/Dashboard/CollectorScheduleWindow.xaml
index ee370e21..b2a8103e 100644
--- a/Dashboard/CollectorScheduleWindow.xaml
+++ b/Dashboard/CollectorScheduleWindow.xaml
@@ -6,6 +6,15 @@
         WindowStartupLocation="CenterOwner"
         ResizeMode="CanResizeWithGrip"
         Background="{DynamicResource BackgroundBrush}">
+    <Window.Resources>
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+            <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+            <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+            <Separator/>
+            <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+        </ContextMenu>
+    </Window.Resources>
     <Grid Margin="16">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -34,7 +43,8 @@
                       Background="{DynamicResource BackgroundBrush}"
                       RowBackground="{DynamicResource BackgroundBrush}"
                       AlternatingRowBackground="{DynamicResource BackgroundLightBrush}"
-                      BorderThickness="0">
+                      BorderThickness="0"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
                     <DataGridCheckBoxColumn Header="Enabled" Binding="{Binding Enabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="65"/>
                     <DataGridTextColumn Header="Collector" Binding="{Binding DisplayName}" Width="180" IsReadOnly="True"/>
diff --git a/Dashboard/CollectorScheduleWindow.xaml.cs b/Dashboard/CollectorScheduleWindow.xaml.cs
index 1eb6aa92..4d1b126e 100644
--- a/Dashboard/CollectorScheduleWindow.xaml.cs
+++ b/Dashboard/CollectorScheduleWindow.xaml.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows;
 using PerformanceMonitorDashboard.Models;
 using PerformanceMonitorDashboard.Services;
@@ -115,6 +116,80 @@ private async void Refresh_Click(object sender, RoutedEventArgs e)
             await LoadSchedulesAsync();
         }
 
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is System.Windows.Controls.MenuItem menuItem && menuItem.Parent is System.Windows.Controls.ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = Helpers.TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is System.Windows.Controls.MenuItem menuItem && menuItem.Parent is System.Windows.Controls.ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(Helpers.TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is System.Windows.Controls.MenuItem menuItem && menuItem.Parent is System.Windows.Controls.ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new System.Text.StringBuilder();
+                    var headers = new List<string>();
+                    foreach (var column in dataGrid.Columns)
+                        headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
+                    sb.AppendLine(string.Join("\t", headers));
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(Helpers.TabHelpers.GetRowAsText(dataGrid, item));
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is System.Windows.Controls.MenuItem menuItem && menuItem.Parent is System.Windows.Controls.ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var dialog = new Microsoft.Win32.SaveFileDialog
+                    {
+                        FileName = $"collector_schedules_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+                    if (dialog.ShowDialog() == true)
+                    {
+                        var sb = new System.Text.StringBuilder();
+                        var headers = new List<string>();
+                        foreach (var column in dataGrid.Columns)
+                            headers.Add(Helpers.TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
+                        sb.AppendLine(string.Join(",", headers));
+                        foreach (var item in dataGrid.Items)
+                        {
+                            var values = Helpers.TabHelpers.GetRowValues(dataGrid, item);
+                            sb.AppendLine(string.Join(",", values.Select(v => Helpers.TabHelpers.EscapeCsvField(v))));
+                        }
+                        System.IO.File.WriteAllText(dialog.FileName, sb.ToString());
+                    }
+                }
+            }
+        }
+
         private void Close_Click(object sender, RoutedEventArgs e)
         {
             Close();
diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml.cs b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
index 132cb1d8..22b9ed79 100644
--- a/Dashboard/Controls/AlertsHistoryContent.xaml.cs
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
@@ -373,7 +373,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     var sb = new StringBuilder();
                     var headers = dataGrid.Columns
                         .OfType<DataGridBoundColumn>()
-                        .Select(c => TabHelpers.GetColumnHeader(c))
+                        .Select(c => Helpers.DataGridClipboardBehavior.GetHeaderText(c))
                         .ToList();
                     sb.AppendLine(string.Join("\t", headers));
 
@@ -404,16 +404,17 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                         try
                         {
                             var sb = new StringBuilder();
+                            var sep = TabHelpers.CsvSeparator;
                             var headers = dataGrid.Columns
                                 .OfType<DataGridBoundColumn>()
-                                .Select(c => TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(c)))
+                                .Select(c => TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(c), sep))
                                 .ToList();
-                            sb.AppendLine(string.Join(",", headers));
+                            sb.AppendLine(string.Join(sep, headers));
 
                             foreach (var item in dataGrid.Items)
                             {
                                 var values = TabHelpers.GetRowValues(dataGrid, item);
-                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                                sb.AppendLine(string.Join(sep, values.Select(v => TabHelpers.EscapeCsvField(v, sep))));
                             }
 
                             File.WriteAllText(saveFileDialog.FileName, sb.ToString());
diff --git a/Dashboard/Controls/ConfigChangesContent.xaml b/Dashboard/Controls/ConfigChangesContent.xaml
new file mode 100644
index 00000000..a0aea1a6
--- /dev/null
+++ b/Dashboard/Controls/ConfigChangesContent.xaml
@@ -0,0 +1,294 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.ConfigChangesContent"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800"
+             Loaded="OnLoaded">
+    <UserControl.Resources>
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+            <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+            <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+            <Separator/>
+            <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+        </ContextMenu>
+    </UserControl.Resources>
+    <TabControl>
+        <!-- Server Configuration Changes Sub-Tab -->
+        <TabItem Header="Server Config Changes">
+            <Grid>
+            <DataGrid x:Name="ServerConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ConfigurationName}" Width="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ConfigurationName" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Configuration" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding OldValueConfigured}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Old Configured" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewValueConfigured}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New Configured" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding OldValueInUse}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Old In Use" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewValueInUse}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New In Use" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding RequiresRestart}" Width="80">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Restart?" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="ServerConfigChangesRestartFilterCombo" Width="70" Height="22" FontSize="11"
+                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="RequiresRestart">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsDynamic}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Dynamic" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="ServerConfigChangesDynamicFilterCombo" Width="60" Height="22" FontSize="11"
+                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsDynamic">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsAdvanced}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Advanced" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="ServerConfigChangesAdvancedFilterCombo" Width="60" Height="22" FontSize="11"
+                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsAdvanced">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="250">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Description}" Width="*">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Description" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="ServerConfigChangesNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+
+        <!-- Database Configuration Changes Sub-Tab -->
+        <TabItem Header="Database Config Changes">
+            <Grid>
+            <DataGrid x:Name="DatabaseConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingType}" Width="120">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingType" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingName}" Width="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Name" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding OldValue}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Old Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewValue}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="DatabaseConfigChangesNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+
+        <!-- Trace Flag Changes Sub-Tab -->
+        <TabItem Header="Trace Flag Changes">
+            <Grid>
+            <DataGrid x:Name="TraceFlagChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding TraceFlag}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Trace Flag" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding PreviousStatus}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PreviousStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Previous Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewStatus}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Scope}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Scope" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Scope" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsGlobal}" Width="80">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Global" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="TraceFlagChangesGlobalFilterCombo" Width="70" Height="22" FontSize="11"
+                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsGlobal">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsSession}" Width="80">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Session" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="TraceFlagChangesSessionFilterCombo" Width="70" Height="22" FontSize="11"
+                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsSession">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="TraceFlagChangesNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+    </TabControl>
+</UserControl>
diff --git a/Dashboard/Controls/ConfigChangesContent.xaml.cs b/Dashboard/Controls/ConfigChangesContent.xaml.cs
new file mode 100644
index 00000000..732af2b0
--- /dev/null
+++ b/Dashboard/Controls/ConfigChangesContent.xaml.cs
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using PerformanceMonitorDashboard.Helpers;
+using PerformanceMonitorDashboard.Models;
+using PerformanceMonitorDashboard.Services;
+
+namespace PerformanceMonitorDashboard.Controls
+{
+    public partial class ConfigChangesContent : UserControl
+    {
+        private DatabaseService? _databaseService;
+
+        private int _hoursBack = 24;
+        private DateTime? _fromDate;
+        private DateTime? _toDate;
+
+        // Popup filter state
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+        private string? _activeFilterGrid;
+
+        private readonly Dictionary<string, ColumnFilterState> _serverConfigChangesFilters = new();
+        private List<ServerConfigChangeItem>? _serverConfigChangesUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _dbConfigChangesFilters = new();
+        private List<DatabaseConfigChangeItem>? _dbConfigChangesUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _traceFlagChangesFilters = new();
+        private List<TraceFlagChangeItem>? _traceFlagChangesUnfilteredData;
+
+        public ConfigChangesContent()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(DatabaseService databaseService)
+        {
+            _databaseService = databaseService;
+        }
+
+        public void SetTimeRange(int hoursBack, DateTime? fromDate, DateTime? toDate)
+        {
+            _hoursBack = hoursBack;
+            _fromDate = fromDate;
+            _toDate = toDate;
+        }
+
+        public async Task RefreshAllDataAsync()
+        {
+            if (_databaseService == null) return;
+
+            await Task.WhenAll(
+                RefreshServerConfigChangesAsync(),
+                RefreshDbConfigChangesAsync(),
+                RefreshTraceFlagChangesAsync()
+            );
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            TabHelpers.AutoSizeColumnMinWidths(ServerConfigChangesDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(DatabaseConfigChangesDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(TraceFlagChangesDataGrid);
+            TabHelpers.FreezeColumns(ServerConfigChangesDataGrid, 1);
+            TabHelpers.FreezeColumns(DatabaseConfigChangesDataGrid, 2);
+            TabHelpers.FreezeColumns(TraceFlagChangesDataGrid, 1);
+        }
+
+        #region Server Configuration Changes
+
+        private async Task RefreshServerConfigChangesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetServerConfigChangesAsync(_hoursBack, _fromDate, _toDate);
+                _serverConfigChangesUnfilteredData = data;
+                _serverConfigChangesFilters.Clear();
+                ServerConfigChangesDataGrid.ItemsSource = data;
+                ServerConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading server configuration changes: {ex.Message}");
+            }
+        }
+
+        private void ServerConfigChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            ApplyServerConfigChangesFilters();
+        }
+
+        private void ApplyServerConfigChangesFilters()
+        {
+            if (_serverConfigChangesUnfilteredData == null) return;
+
+            var restartFilter = (ServerConfigChangesRestartFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+            var dynamicFilter = (ServerConfigChangesDynamicFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+            var advancedFilter = (ServerConfigChangesAdvancedFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+
+            if (_serverConfigChangesFilters.Count == 0 && restartFilter == "All" && dynamicFilter == "All" && advancedFilter == "All")
+            {
+                ServerConfigChangesDataGrid.ItemsSource = _serverConfigChangesUnfilteredData;
+                return;
+            }
+
+            var filteredData = _serverConfigChangesUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _serverConfigChangesFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+
+                if (restartFilter != "All" && restartFilter != null)
+                {
+                    bool expected = restartFilter == "True";
+                    if (item.RequiresRestart != expected) return false;
+                }
+                if (dynamicFilter != "All" && dynamicFilter != null)
+                {
+                    bool expected = dynamicFilter == "True";
+                    if (item.IsDynamic != expected) return false;
+                }
+                if (advancedFilter != "All" && advancedFilter != null)
+                {
+                    bool expected = advancedFilter == "True";
+                    if (item.IsAdvanced != expected) return false;
+                }
+
+                return true;
+            }).ToList();
+
+            ServerConfigChangesDataGrid.ItemsSource = filteredData;
+        }
+
+        #endregion
+
+        #region Database Configuration Changes
+
+        private async Task RefreshDbConfigChangesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetDatabaseConfigChangesAsync(_hoursBack, _fromDate, _toDate);
+                _dbConfigChangesUnfilteredData = data;
+                _dbConfigChangesFilters.Clear();
+                DatabaseConfigChangesDataGrid.ItemsSource = data;
+                DatabaseConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading database configuration changes: {ex.Message}");
+            }
+        }
+
+        private void ApplyDbConfigChangesFilters()
+        {
+            if (_dbConfigChangesUnfilteredData == null) return;
+
+            if (_dbConfigChangesFilters.Count == 0)
+            {
+                DatabaseConfigChangesDataGrid.ItemsSource = _dbConfigChangesUnfilteredData;
+                return;
+            }
+
+            var filteredData = _dbConfigChangesUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _dbConfigChangesFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+                return true;
+            }).ToList();
+
+            DatabaseConfigChangesDataGrid.ItemsSource = filteredData;
+        }
+
+        #endregion
+
+        #region Trace Flag Changes
+
+        private async Task RefreshTraceFlagChangesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetTraceFlagChangesAsync(_hoursBack, _fromDate, _toDate);
+                _traceFlagChangesUnfilteredData = data;
+                _traceFlagChangesFilters.Clear();
+                TraceFlagChangesDataGrid.ItemsSource = data;
+                TraceFlagChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading trace flag changes: {ex.Message}");
+            }
+        }
+
+        private void TraceFlagChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            ApplyTraceFlagChangesFilters();
+        }
+
+        private void ApplyTraceFlagChangesFilters()
+        {
+            if (_traceFlagChangesUnfilteredData == null) return;
+
+            var globalFilter = (TraceFlagChangesGlobalFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+            var sessionFilter = (TraceFlagChangesSessionFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+
+            if (_traceFlagChangesFilters.Count == 0 && globalFilter == "All" && sessionFilter == "All")
+            {
+                TraceFlagChangesDataGrid.ItemsSource = _traceFlagChangesUnfilteredData;
+                return;
+            }
+
+            var filteredData = _traceFlagChangesUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _traceFlagChangesFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+
+                if (globalFilter != "All" && globalFilter != null)
+                {
+                    bool expected = globalFilter == "True";
+                    if (item.IsGlobal != expected) return false;
+                }
+                if (sessionFilter != "All" && sessionFilter != null)
+                {
+                    bool expected = sessionFilter == "True";
+                    if (item.IsSession != expected) return false;
+                }
+
+                return true;
+            }).ToList();
+
+            TraceFlagChangesDataGrid.ItemsSource = filteredData;
+        }
+
+        #endregion
+
+        #region Popup Filter Infrastructure
+
+        private void ServerConfigChangesFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "ServerConfigChanges";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _serverConfigChangesFilters);
+        }
+
+        private void DbConfigChangesFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "DbConfigChanges";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _dbConfigChangesFilters);
+        }
+
+        private void TraceFlagChangesFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "TraceFlagChanges";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _traceFlagChangesFilters);
+        }
+
+        private void ShowFilterPopup(Button button, string columnName, Dictionary<string, ColumnFilterState> filters)
+        {
+            if (_filterPopup == null)
+            {
+                _filterPopupContent = new ColumnFilterPopup();
+                _filterPopupContent.FilterApplied += FilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared += FilterPopup_FilterCleared;
+
+                _filterPopup = new Popup
+                {
+                    Child = _filterPopupContent,
+                    StaysOpen = false,
+                    Placement = PlacementMode.Bottom,
+                    AllowsTransparency = true
+                };
+            }
+
+            filters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+            _filterPopup.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+
+            switch (_activeFilterGrid)
+            {
+                case "ServerConfigChanges":
+                    if (e.FilterState.IsActive)
+                        _serverConfigChangesFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _serverConfigChangesFilters.Remove(e.FilterState.ColumnName);
+                    ApplyServerConfigChangesFilters();
+                    UpdateFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
+                    break;
+
+                case "DbConfigChanges":
+                    if (e.FilterState.IsActive)
+                        _dbConfigChangesFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _dbConfigChangesFilters.Remove(e.FilterState.ColumnName);
+                    ApplyDbConfigChangesFilters();
+                    UpdateFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
+                    break;
+
+                case "TraceFlagChanges":
+                    if (e.FilterState.IsActive)
+                        _traceFlagChangesFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _traceFlagChangesFilters.Remove(e.FilterState.ColumnName);
+                    ApplyTraceFlagChangesFilters();
+                    UpdateFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
+                    break;
+            }
+        }
+
+        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+        }
+
+        private void UpdateFilterButtonStyles(DataGrid grid, Dictionary<string, ColumnFilterState> filters)
+        {
+            foreach (var column in grid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
+                {
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton != null && filterButton.Tag is string columnName)
+                    {
+                        bool hasActiveFilter = filters.TryGetValue(columnName, out var filter) && filter.IsActive;
+
+                        var textBlock = new TextBlock
+                        {
+                            Text = "\uE71C",
+                            FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                            Foreground = hasActiveFilter
+                                ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xD7, 0x00))
+                                : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xFF, 0xFF))
+                        };
+                        filterButton.Content = textBlock;
+                        filterButton.ToolTip = hasActiveFilter && filter != null
+                            ? $"Filter: {filter.DisplayText}\n(Click to modify)"
+                            : "Click to filter";
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Context Menu Handlers
+
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new System.Text.StringBuilder();
+                    var headers = new List<string>();
+                    foreach (var column in dataGrid.Columns)
+                        headers.Add(DataGridClipboardBehavior.GetHeaderText(column));
+                    sb.AppendLine(string.Join("\t", headers));
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(TabHelpers.GetRowAsText(dataGrid, item));
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var dialog = new Microsoft.Win32.SaveFileDialog
+                    {
+                        FileName = $"config_changes_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+                    if (dialog.ShowDialog() == true)
+                    {
+                        var sb = new System.Text.StringBuilder();
+                        var headers = new List<string>();
+                        foreach (var column in dataGrid.Columns)
+                            headers.Add(TabHelpers.EscapeCsvField(DataGridClipboardBehavior.GetHeaderText(column)));
+                        sb.AppendLine(string.Join(",", headers));
+                        foreach (var item in dataGrid.Items)
+                        {
+                            var values = TabHelpers.GetRowValues(dataGrid, item);
+                            sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                        }
+                        System.IO.File.WriteAllText(dialog.FileName, sb.ToString());
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Dashboard/Controls/CriticalIssuesContent.xaml b/Dashboard/Controls/CriticalIssuesContent.xaml
index 17ce8acb..4fee8472 100644
--- a/Dashboard/Controls/CriticalIssuesContent.xaml
+++ b/Dashboard/Controls/CriticalIssuesContent.xaml
@@ -42,7 +42,7 @@
               GridLinesVisibility="All" CanUserResizeColumns="True"
               RowStyle="{StaticResource DefaultRowStyle}">
         <DataGrid.Columns>
-            <DataGridTextColumn Binding="{Binding IssueId}" Width="80">
+            <DataGridTextColumn Binding="{Binding IssueId}" ElementStyle="{StaticResource NumericCell}" Width="80">
                 <DataGridTextColumn.Header>
                     <StackPanel Orientation="Horizontal">
                         <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IssueId" Click="CriticalIssuesFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/CriticalIssuesContent.xaml.cs b/Dashboard/Controls/CriticalIssuesContent.xaml.cs
index cecc99c2..9d265e61 100644
--- a/Dashboard/Controls/CriticalIssuesContent.xaml.cs
+++ b/Dashboard/Controls/CriticalIssuesContent.xaml.cs
@@ -308,7 +308,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -351,16 +351,16 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column), TabHelpers.CsvSeparator));
                                 }
                             }
-                            sb.AppendLine(string.Join(",", headers));
+                            sb.AppendLine(string.Join(TabHelpers.CsvSeparator, headers));
 
                             // Add all rows
                             foreach (var item in dataGrid.Items)
                             {
                                 var values = TabHelpers.GetRowValues(dataGrid, item);
-                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                                sb.AppendLine(string.Join(TabHelpers.CsvSeparator, values.Select(v => TabHelpers.EscapeCsvField(v, TabHelpers.CsvSeparator))));
                             }
 
                             File.WriteAllText(saveFileDialog.FileName, sb.ToString());
diff --git a/Dashboard/Controls/CurrentConfigContent.xaml b/Dashboard/Controls/CurrentConfigContent.xaml
index 1a42ce54..d3a5bfaf 100644
--- a/Dashboard/Controls/CurrentConfigContent.xaml
+++ b/Dashboard/Controls/CurrentConfigContent.xaml
@@ -6,13 +6,23 @@
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800"
              Loaded="OnLoaded">
+    <UserControl.Resources>
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+            <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+            <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+            <Separator/>
+            <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+        </ContextMenu>
+    </UserControl.Resources>
     <TabControl>
         <!-- Current Server Configuration Sub-Tab -->
         <TabItem Header="Server Configuration">
             <Grid>
             <DataGrid x:Name="ServerConfigDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
                       RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding ConfigurationName}" Width="220">
                         <DataGridTextColumn.Header>
@@ -97,7 +107,8 @@
             <Grid>
             <DataGrid x:Name="DatabaseConfigDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
                       RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="150">
                         <DataGridTextColumn.Header>
@@ -150,9 +161,10 @@
             <Grid>
             <DataGrid x:Name="TraceFlagsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
                       RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Binding="{Binding TraceFlag}" Width="100">
+                    <DataGridTextColumn Binding="{Binding TraceFlag}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/CurrentConfigContent.xaml.cs b/Dashboard/Controls/CurrentConfigContent.xaml.cs
index 85d98e4b..de41d11a 100644
--- a/Dashboard/Controls/CurrentConfigContent.xaml.cs
+++ b/Dashboard/Controls/CurrentConfigContent.xaml.cs
@@ -278,5 +278,83 @@ private void UpdateFilterButtonStyles(DataGrid grid, Dictionary<string, ColumnFi
         }
 
         #endregion
+
+        #region Context Menu Handlers
+
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new System.Text.StringBuilder();
+                    var headers = new List<string>();
+                    foreach (var column in dataGrid.Columns)
+                        headers.Add(DataGridClipboardBehavior.GetHeaderText(column));
+                    sb.AppendLine(string.Join("\t", headers));
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(TabHelpers.GetRowAsText(dataGrid, item));
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var dialog = new Microsoft.Win32.SaveFileDialog
+                    {
+                        FileName = $"config_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+                    if (dialog.ShowDialog() == true)
+                    {
+                        var sb = new System.Text.StringBuilder();
+                        var headers = new List<string>();
+                        foreach (var column in dataGrid.Columns)
+                            headers.Add(TabHelpers.EscapeCsvField(DataGridClipboardBehavior.GetHeaderText(column)));
+                        sb.AppendLine(string.Join(",", headers));
+                        foreach (var item in dataGrid.Items)
+                        {
+                            var values = TabHelpers.GetRowValues(dataGrid, item);
+                            sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                        }
+                        System.IO.File.WriteAllText(dialog.FileName, sb.ToString());
+                    }
+                }
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/Dashboard/Controls/DailySummaryContent.xaml b/Dashboard/Controls/DailySummaryContent.xaml
index 652a8b8f..9219f4f7 100644
--- a/Dashboard/Controls/DailySummaryContent.xaml
+++ b/Dashboard/Controls/DailySummaryContent.xaml
@@ -79,7 +79,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalWaitTimeSec, StringFormat='{}{0:N2}'}" Width="130">
+                <DataGridTextColumn Binding="{Binding TotalWaitTimeSec, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="130">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWaitTimeSec" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
@@ -95,7 +95,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding ExpensiveQueriesCount, StringFormat='{}{0:N0}'}" Width="130">
+                <DataGridTextColumn Binding="{Binding ExpensiveQueriesCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="130">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExpensiveQueriesCount" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
@@ -103,7 +103,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding DeadlockCount, StringFormat='{}{0:N0}'}" Width="100">
+                <DataGridTextColumn Binding="{Binding DeadlockCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DeadlockCount" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
@@ -111,7 +111,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding BlockingEventsCount, StringFormat='{}{0:N0}'}" Width="130">
+                <DataGridTextColumn Binding="{Binding BlockingEventsCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="130">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockingEventsCount" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
@@ -119,7 +119,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MemoryPressureEvents, StringFormat='{}{0:N0}'}" Width="140">
+                <DataGridTextColumn Binding="{Binding MemoryPressureEvents, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="140">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MemoryPressureEvents" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
@@ -127,7 +127,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding HighCpuEvents, StringFormat='{}{0:N0}'}" Width="120">
+                <DataGridTextColumn Binding="{Binding HighCpuEvents, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HighCpuEvents" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
@@ -135,7 +135,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding CollectorsFailing, StringFormat='{}{0:N0}'}" Width="130">
+                <DataGridTextColumn Binding="{Binding CollectorsFailing, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="130">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorsFailing" Click="DailySummaryFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/DailySummaryContent.xaml.cs b/Dashboard/Controls/DailySummaryContent.xaml.cs
index e7d77b5b..96d1f88e 100644
--- a/Dashboard/Controls/DailySummaryContent.xaml.cs
+++ b/Dashboard/Controls/DailySummaryContent.xaml.cs
@@ -385,7 +385,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -428,16 +428,16 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column), TabHelpers.CsvSeparator));
                                 }
                             }
-                            sb.AppendLine(string.Join(",", headers));
+                            sb.AppendLine(string.Join(TabHelpers.CsvSeparator, headers));
 
                             // Add all rows
                             foreach (var item in dataGrid.Items)
                             {
                                 var values = TabHelpers.GetRowValues(dataGrid, item);
-                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                                sb.AppendLine(string.Join(TabHelpers.CsvSeparator, values.Select(v => TabHelpers.EscapeCsvField(v, TabHelpers.CsvSeparator))));
                             }
 
                             File.WriteAllText(saveFileDialog.FileName, sb.ToString());
diff --git a/Dashboard/Controls/DefaultTraceContent.xaml b/Dashboard/Controls/DefaultTraceContent.xaml
index 332d4d89..f85534d1 100644
--- a/Dashboard/Controls/DefaultTraceContent.xaml
+++ b/Dashboard/Controls/DefaultTraceContent.xaml
@@ -33,7 +33,7 @@
 
                 <Grid Grid.Row="1">
                 <DataGrid x:Name="DefaultTraceEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                          RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{DynamicResource DataGridContextMenu}"
+                          GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{DynamicResource DataGridContextMenu}"
                           ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding EventTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
@@ -103,7 +103,7 @@
         <TabItem Header="Trace Analysis">
             <Grid>
             <DataGrid x:Name="TraceAnalysisDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{DynamicResource DataGridContextMenu}"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{DynamicResource DataGridContextMenu}"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
@@ -138,7 +138,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding DurationMs, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn Binding="{Binding DurationMs, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DurationMs" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
@@ -146,7 +146,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CpuMs, StringFormat=N0}" Width="80">
+                    <DataGridTextColumn Binding="{Binding CpuMs, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CpuMs" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
@@ -154,7 +154,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Reads" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
@@ -162,7 +162,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Writes" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
@@ -170,14 +170,19 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding SqlText}" Width="400">
-                        <DataGridTextColumn.Header>
+                    <DataGridTemplateColumn Width="400">
+                        <DataGridTemplateColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SqlText" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
                                 <TextBlock Text="SQL Text" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding SqlText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding SqlText}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock x:Name="TraceAnalysisNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
diff --git a/Dashboard/Controls/MemoryContent.xaml b/Dashboard/Controls/MemoryContent.xaml
index d157b62a..ce1a6f95 100644
--- a/Dashboard/Controls/MemoryContent.xaml
+++ b/Dashboard/Controls/MemoryContent.xaml
@@ -95,34 +95,40 @@
 
         <!-- Memory Grants Sub-Tab -->
         <TabItem Header="Memory Grants">
-            <!-- Chart + Summary Panel (grid removed) -->
-            <Border BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="5">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" Text="Memory Grants Over Time" FontWeight="Bold" FontSize="14" Margin="10,5" Foreground="{DynamicResource ForegroundBrush}"/>
-                    <ScottPlot:WpfPlot Grid.Row="1" x:Name="MemoryGrantsChart"/>
-                    <!-- Summary Panel -->
-                    <Border Grid.Row="2" Background="{DynamicResource BackgroundBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0" Padding="10,8">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <TextBlock Text="Grantees:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryGrantsGranteesText" Text="0" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                            <TextBlock Text="Waiters:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryGrantsWaitersText" Text="0" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                            <TextBlock Text="Timeouts:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryGrantsTimeoutsText" Text="0" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                            <TextBlock Text="Forced:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryGrantsForcedText" Text="0" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-                        </StackPanel>
-                    </Border>
-                    <TextBlock x:Name="MemoryGrantsNoDataMessage" Grid.Row="1" Style="{StaticResource EmptyStateMessage}"
-                               Text="No memory grant data in selected time range"/>
-                    <controls:LoadingOverlay x:Name="MemoryGrantsLoading" Grid.Row="1"/>
-                </Grid>
-            </Border>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <!-- Chart 1: Memory Grant Sizing -->
+                <Border Grid.Row="0" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="5,5,5,2">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Row="0" Text="Memory Grant Sizing Over Time" FontWeight="Bold" FontSize="14" Margin="10,5" Foreground="{DynamicResource ForegroundBrush}"/>
+                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="MemoryGrantSizingChart"/>
+                        <TextBlock x:Name="MemoryGrantSizingNoData" Grid.Row="1" Style="{StaticResource EmptyStateMessage}"
+                                   Text="No memory grant data in selected time range"/>
+                        <controls:LoadingOverlay x:Name="MemoryGrantSizingLoading" Grid.Row="1"/>
+                    </Grid>
+                </Border>
+                <!-- Chart 2: Memory Grant Activity -->
+                <Border Grid.Row="1" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="5,2,5,5">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Row="0" Text="Memory Grant Activity Over Time" FontWeight="Bold" FontSize="14" Margin="10,5" Foreground="{DynamicResource ForegroundBrush}"/>
+                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="MemoryGrantActivityChart"/>
+                        <TextBlock x:Name="MemoryGrantActivityNoData" Grid.Row="1" Style="{StaticResource EmptyStateMessage}"
+                                   Text="No memory grant data in selected time range"/>
+                        <controls:LoadingOverlay x:Name="MemoryGrantActivityLoading" Grid.Row="1"/>
+                    </Grid>
+                </Border>
+            </Grid>
         </TabItem>
 
         <!-- Memory Clerks Sub-Tab -->
diff --git a/Dashboard/Controls/MemoryContent.xaml.cs b/Dashboard/Controls/MemoryContent.xaml.cs
index 5ce7ee3b..f3ca9334 100644
--- a/Dashboard/Controls/MemoryContent.xaml.cs
+++ b/Dashboard/Controls/MemoryContent.xaml.cs
@@ -64,7 +64,8 @@ public partial class MemoryContent : UserControl
 
         // Chart hover tooltips
         private Helpers.ChartHoverHelper? _memoryStatsOverviewHover;
-        private Helpers.ChartHoverHelper? _memoryGrantsHover;
+        private Helpers.ChartHoverHelper? _memoryGrantSizingHover;
+        private Helpers.ChartHoverHelper? _memoryGrantActivityHover;
         private Helpers.ChartHoverHelper? _memoryClerksHover;
         private Helpers.ChartHoverHelper? _planCacheHover;
         private Helpers.ChartHoverHelper? _memoryPressureEventsHover;
@@ -78,7 +79,8 @@ public MemoryContent()
             Loaded += OnLoaded;
 
             _memoryStatsOverviewHover = new Helpers.ChartHoverHelper(MemoryStatsOverviewChart, "MB");
-            _memoryGrantsHover = new Helpers.ChartHoverHelper(MemoryGrantsChart, "MB");
+            _memoryGrantSizingHover = new Helpers.ChartHoverHelper(MemoryGrantSizingChart, "MB");
+            _memoryGrantActivityHover = new Helpers.ChartHoverHelper(MemoryGrantActivityChart, "count");
             _memoryClerksHover = new Helpers.ChartHoverHelper(MemoryClerksChart, "MB");
             _planCacheHover = new Helpers.ChartHoverHelper(PlanCacheChart, "MB");
             _memoryPressureEventsHover = new Helpers.ChartHoverHelper(MemoryPressureEventsChart, "events");
@@ -94,8 +96,9 @@ private void SetupChartContextMenus()
             // Memory Stats Overview chart
             TabHelpers.SetupChartContextMenu(MemoryStatsOverviewChart, "Memory_Stats_Overview", "collect.memory_stats");
 
-            // Memory Grants chart
-            TabHelpers.SetupChartContextMenu(MemoryGrantsChart, "Memory_Grants", "collect.memory_grant_stats");
+            // Memory Grant charts
+            TabHelpers.SetupChartContextMenu(MemoryGrantSizingChart, "Memory_Grant_Sizing", "collect.memory_grant_stats");
+            TabHelpers.SetupChartContextMenu(MemoryGrantActivityChart, "Memory_Grant_Activity", "collect.memory_grant_stats");
 
             // Memory Clerks chart
             TabHelpers.SetupChartContextMenu(MemoryClerksChart, "Memory_Clerks", "collect.memory_clerks_stats");
@@ -391,112 +394,213 @@ private void UpdateMemoryStatsSummaryPanel(List<MemoryStatsItem> dataList)
 
         #region Memory Grants
 
+        private sealed class PoolGrantPoint
+        {
+            public DateTime CollectionTime { get; set; }
+            public int PoolId { get; set; }
+            public double AvailableMemoryMb { get; set; }
+            public double GrantedMemoryMb { get; set; }
+            public double UsedMemoryMb { get; set; }
+            public double GranteeCount { get; set; }
+            public double WaiterCount { get; set; }
+            public double TimeoutErrorCountDelta { get; set; }
+            public double ForcedGrantCountDelta { get; set; }
+        }
+
         private async System.Threading.Tasks.Task RefreshMemoryGrantsAsync()
         {
             if (_databaseService == null) return;
 
             try
             {
-                // Only show loading overlay on initial load (no existing chart data)
-                if (!MemoryGrantsChart.Plot.GetPlottables().Any())
+                if (!MemoryGrantSizingChart.Plot.GetPlottables().Any())
                 {
-                    MemoryGrantsLoading.IsLoading = true;
-                    MemoryGrantsNoDataMessage.Visibility = Visibility.Collapsed;
+                    MemoryGrantSizingLoading.IsLoading = true;
+                    MemoryGrantSizingNoData.Visibility = Visibility.Collapsed;
+                    MemoryGrantActivityNoData.Visibility = Visibility.Collapsed;
                 }
 
                 var data = await _databaseService.GetMemoryGrantStatsAsync(_memoryGrantsHoursBack, _memoryGrantsFromDate, _memoryGrantsToDate);
                 var dataList = data.ToList();
-                MemoryGrantsNoDataMessage.Visibility = dataList.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                LoadMemoryGrantsChart(dataList, _memoryGrantsHoursBack, _memoryGrantsFromDate, _memoryGrantsToDate);
+
+                // Filter to rows with active grants for charting
+                var filtered = dataList.Where(d => (d.GrantedMemoryMb ?? 0) > 0).ToList();
+
+                bool hasData = filtered.Count > 0;
+                MemoryGrantSizingNoData.Visibility = hasData ? Visibility.Collapsed : Visibility.Visible;
+                MemoryGrantActivityNoData.Visibility = hasData ? Visibility.Collapsed : Visibility.Visible;
+
+                // Aggregate across resource_semaphore_id within each pool
+                var aggregated = filtered
+                    .GroupBy(d => new { d.CollectionTime, d.PoolId })
+                    .Select(g => new PoolGrantPoint
+                    {
+                        CollectionTime = g.Key.CollectionTime,
+                        PoolId = g.Key.PoolId,
+                        AvailableMemoryMb = g.Sum(x => (double)(x.AvailableMemoryMb ?? 0)),
+                        GrantedMemoryMb = g.Sum(x => (double)(x.GrantedMemoryMb ?? 0)),
+                        UsedMemoryMb = g.Sum(x => (double)(x.UsedMemoryMb ?? 0)),
+                        GranteeCount = g.Sum(x => (double)(x.GranteeCount ?? 0)),
+                        WaiterCount = g.Sum(x => (double)(x.WaiterCount ?? 0)),
+                        TimeoutErrorCountDelta = g.Sum(x => (double)(x.TimeoutErrorCountDelta ?? 0)),
+                        ForcedGrantCountDelta = g.Sum(x => (double)(x.ForcedGrantCountDelta ?? 0))
+                    })
+                    .OrderBy(d => d.CollectionTime)
+                    .ToList();
+
+                LoadMemoryGrantSizingChart(aggregated, _memoryGrantsHoursBack, _memoryGrantsFromDate, _memoryGrantsToDate);
+                LoadMemoryGrantActivityChart(aggregated, _memoryGrantsHoursBack, _memoryGrantsFromDate, _memoryGrantsToDate);
             }
             catch (Exception ex)
             {
                 Logger.Error($"Error loading memory grants: {ex.Message}");
+                MemoryGrantSizingNoData.Visibility = Visibility.Visible;
+                MemoryGrantActivityNoData.Visibility = Visibility.Visible;
             }
             finally
             {
-                MemoryGrantsLoading.IsLoading = false;
+                MemoryGrantSizingLoading.IsLoading = false;
+                MemoryGrantActivityLoading.IsLoading = false;
             }
         }
 
-        private void LoadMemoryGrantsChart(IEnumerable<MemoryGrantStatsItem> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+        private void LoadMemoryGrantSizingChart(List<PoolGrantPoint> aggregated, int hoursBack, DateTime? fromDate, DateTime? toDate)
         {
             DateTime rangeEnd = toDate ?? Helpers.ServerTimeHelper.ServerNow;
             DateTime rangeStart = fromDate ?? rangeEnd.AddHours(-hoursBack);
             double xMin = rangeStart.ToOADate();
             double xMax = rangeEnd.ToOADate();
 
-            if (_legendPanels.TryGetValue(MemoryGrantsChart, out var existingPanel) && existingPanel != null)
-            {
-                MemoryGrantsChart.Plot.Axes.Remove(existingPanel);
-                _legendPanels[MemoryGrantsChart] = null;
-            }
-            MemoryGrantsChart.Plot.Clear();
-            _memoryGrantsHover?.Clear();
-            TabHelpers.ApplyDarkModeToChart(MemoryGrantsChart);
-
-            var dataList = data?.OrderBy(d => d.CollectionTime).ToList() ?? new List<MemoryGrantStatsItem>();
-            
-            // Aggregate by collection_time to avoid doubling from multiple resource_semaphore_ids
-            // SUM granted (actual usage), MAX target (global limit)
-            var aggregated = dataList
-                .GroupBy(d => d.CollectionTime)
-                .Select(g => new {
-                    CollectionTime = g.Key,
-                    GrantedMemoryMb = g.Sum(x => x.GrantedMemoryMb ?? 0m),
-                    TargetMemoryMb = g.Max(x => x.TargetMemoryMb ?? 0m)
-                })
-                .OrderBy(d => d.CollectionTime)
-                .ToList();
-            
-            // Granted MB series with gap filling (already aggregated, no further summing needed)
-            var (grantedXs, grantedYs) = TabHelpers.FillTimeSeriesGaps(
-                aggregated.Select(d => d.CollectionTime),
-                aggregated.Select(d => (double)d.GrantedMemoryMb));
-
-            // Target MB series with gap filling (already aggregated)
-            var (targetXs, targetYs) = TabHelpers.FillTimeSeriesGaps(
-                aggregated.Select(d => d.CollectionTime),
-                aggregated.Select(d => (double)d.TargetMemoryMb));
-
-            if (grantedXs.Length > 0)
-            {
-                var grantedScatter = MemoryGrantsChart.Plot.Add.Scatter(grantedXs, grantedYs);
-                grantedScatter.LineWidth = 2;
-                grantedScatter.MarkerSize = 5;
-                grantedScatter.Color = TabHelpers.ChartColors[0];
-                grantedScatter.LegendText = "Granted MB";
-                _memoryGrantsHover?.Add(grantedScatter, "Granted MB");
-
-                var targetScatter = MemoryGrantsChart.Plot.Add.Scatter(targetXs, targetYs);
-                targetScatter.LineWidth = 2;
-                targetScatter.MarkerSize = 5;
-                targetScatter.Color = TabHelpers.ChartColors[2];
-                targetScatter.LegendText = "Target MB";
-                _memoryGrantsHover?.Add(targetScatter, "Target MB");
-
-                _legendPanels[MemoryGrantsChart] = MemoryGrantsChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
-                MemoryGrantsChart.Plot.Legend.FontSize = 12;
+            if (_legendPanels.TryGetValue(MemoryGrantSizingChart, out var existingPanel) && existingPanel != null)
+            {
+                MemoryGrantSizingChart.Plot.Axes.Remove(existingPanel);
+                _legendPanels[MemoryGrantSizingChart] = null;
             }
-            else
+            MemoryGrantSizingChart.Plot.Clear();
+            _memoryGrantSizingHover?.Clear();
+            TabHelpers.ApplyDarkModeToChart(MemoryGrantSizingChart);
+
+            var poolIds = aggregated.Select(d => d.PoolId).Distinct().OrderBy(id => id).ToList();
+            int colorIndex = 0;
+            var colors = TabHelpers.ChartColors;
+            bool hasData = false;
+
+            foreach (var poolId in poolIds)
             {
-                double xCenter = xMin + (xMax - xMin) / 2;
-                var noDataText = MemoryGrantsChart.Plot.Add.Text("No data for selected time range", xCenter, 0.5);
-                noDataText.LabelFontSize = 14;
-                noDataText.LabelFontColor = ScottPlot.Colors.Gray;
-                noDataText.LabelAlignment = ScottPlot.Alignment.MiddleCenter;
+                var poolData = aggregated.Where(d => d.PoolId == poolId).OrderBy(d => d.CollectionTime).ToList();
+                if (poolData.Count == 0) continue;
+                hasData = true;
+
+                var metrics = new (string Name, Func<PoolGrantPoint, double> Selector)[] {
+                    ("Available MB", d => d.AvailableMemoryMb),
+                    ("Granted MB", d => d.GrantedMemoryMb),
+                    ("Used MB", d => d.UsedMemoryMb)
+                };
+
+                foreach (var (metricName, selector) in metrics)
+                {
+                    var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
+                        poolData.Select(d => d.CollectionTime),
+                        poolData.Select(selector));
+
+                    if (xs.Length > 0)
+                    {
+                        var scatter = MemoryGrantSizingChart.Plot.Add.Scatter(xs, ys);
+                        scatter.LineWidth = 2;
+                        scatter.MarkerSize = 5;
+                        scatter.Color = colors[colorIndex % colors.Length];
+                        var label = $"Pool {poolId}: {metricName}";
+                        scatter.LegendText = label;
+                        _memoryGrantSizingHover?.Add(scatter, label);
+                        colorIndex++;
+                    }
+                }
             }
 
-            MemoryGrantsChart.Plot.Axes.DateTimeTicksBottom();
-            MemoryGrantsChart.Plot.Axes.SetLimitsX(xMin, xMax);
-            MemoryGrantsChart.Plot.YLabel("MB");
-            // Fixed negative space for legend
-            MemoryGrantsChart.Plot.Axes.AutoScaleY();
-            var grantsLimits = MemoryGrantsChart.Plot.Axes.GetLimits();
-            MemoryGrantsChart.Plot.Axes.SetLimitsY(0, grantsLimits.Top * 1.05);
+            if (hasData)
+            {
+                _legendPanels[MemoryGrantSizingChart] = MemoryGrantSizingChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
+                MemoryGrantSizingChart.Plot.Legend.FontSize = 12;
+            }
+
+            MemoryGrantSizingChart.Plot.Axes.DateTimeTicksBottom();
+            MemoryGrantSizingChart.Plot.Axes.SetLimitsX(xMin, xMax);
+            MemoryGrantSizingChart.Plot.YLabel("MB");
+            MemoryGrantSizingChart.Plot.Axes.AutoScaleY();
+            var limits = MemoryGrantSizingChart.Plot.Axes.GetLimits();
+            MemoryGrantSizingChart.Plot.Axes.SetLimitsY(0, limits.Top * 1.05);
+            TabHelpers.LockChartVerticalAxis(MemoryGrantSizingChart);
+            MemoryGrantSizingChart.Refresh();
+        }
+
+        private void LoadMemoryGrantActivityChart(List<PoolGrantPoint> aggregated, int hoursBack, DateTime? fromDate, DateTime? toDate)
+        {
+            DateTime rangeEnd = toDate ?? Helpers.ServerTimeHelper.ServerNow;
+            DateTime rangeStart = fromDate ?? rangeEnd.AddHours(-hoursBack);
+            double xMin = rangeStart.ToOADate();
+            double xMax = rangeEnd.ToOADate();
+
+            if (_legendPanels.TryGetValue(MemoryGrantActivityChart, out var existingPanel) && existingPanel != null)
+            {
+                MemoryGrantActivityChart.Plot.Axes.Remove(existingPanel);
+                _legendPanels[MemoryGrantActivityChart] = null;
+            }
+            MemoryGrantActivityChart.Plot.Clear();
+            _memoryGrantActivityHover?.Clear();
+            TabHelpers.ApplyDarkModeToChart(MemoryGrantActivityChart);
+
+            var poolIds = aggregated.Select(d => d.PoolId).Distinct().OrderBy(id => id).ToList();
+            int colorIndex = 0;
+            var colors = TabHelpers.ChartColors;
+            bool hasData = false;
+
+            foreach (var poolId in poolIds)
+            {
+                var poolData = aggregated.Where(d => d.PoolId == poolId).OrderBy(d => d.CollectionTime).ToList();
+                if (poolData.Count == 0) continue;
+                hasData = true;
+
+                var metrics = new (string Name, Func<PoolGrantPoint, double> Selector)[] {
+                    ("Grantees", d => d.GranteeCount),
+                    ("Waiters", d => d.WaiterCount),
+                    ("Timeouts", d => d.TimeoutErrorCountDelta),
+                    ("Forced Grants", d => d.ForcedGrantCountDelta)
+                };
+
+                foreach (var (metricName, selector) in metrics)
+                {
+                    var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
+                        poolData.Select(d => d.CollectionTime),
+                        poolData.Select(selector));
+
+                    if (xs.Length > 0)
+                    {
+                        var scatter = MemoryGrantActivityChart.Plot.Add.Scatter(xs, ys);
+                        scatter.LineWidth = 2;
+                        scatter.MarkerSize = 5;
+                        scatter.Color = colors[colorIndex % colors.Length];
+                        var label = $"Pool {poolId}: {metricName}";
+                        scatter.LegendText = label;
+                        _memoryGrantActivityHover?.Add(scatter, label);
+                        colorIndex++;
+                    }
+                }
+            }
+
+            if (hasData)
+            {
+                _legendPanels[MemoryGrantActivityChart] = MemoryGrantActivityChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
+                MemoryGrantActivityChart.Plot.Legend.FontSize = 12;
+            }
 
-            TabHelpers.LockChartVerticalAxis(MemoryGrantsChart);
-            MemoryGrantsChart.Refresh();
+            MemoryGrantActivityChart.Plot.Axes.DateTimeTicksBottom();
+            MemoryGrantActivityChart.Plot.Axes.SetLimitsX(xMin, xMax);
+            MemoryGrantActivityChart.Plot.YLabel("Count");
+            MemoryGrantActivityChart.Plot.Axes.AutoScaleY();
+            var limits = MemoryGrantActivityChart.Plot.Axes.GetLimits();
+            MemoryGrantActivityChart.Plot.Axes.SetLimitsY(0, limits.Top * 1.05);
+            TabHelpers.LockChartVerticalAxis(MemoryGrantActivityChart);
+            MemoryGrantActivityChart.Refresh();
         }
 
         #endregion
@@ -928,7 +1032,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -974,16 +1078,16 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column), TabHelpers.CsvSeparator));
                                 }
                             }
-                            sb.AppendLine(string.Join(",", headers));
+                            sb.AppendLine(string.Join(TabHelpers.CsvSeparator, headers));
 
                             // Add all rows
                             foreach (var item in dataGrid.Items)
                             {
                                 var values = TabHelpers.GetRowValues(dataGrid, item);
-                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                                sb.AppendLine(string.Join(TabHelpers.CsvSeparator, values.Select(v => TabHelpers.EscapeCsvField(v, TabHelpers.CsvSeparator))));
                             }
 
                             File.WriteAllText(saveFileDialog.FileName, sb.ToString());
diff --git a/Dashboard/Controls/PlanViewerControl.xaml b/Dashboard/Controls/PlanViewerControl.xaml
new file mode 100644
index 00000000..c5e06082
--- /dev/null
+++ b/Dashboard/Controls/PlanViewerControl.xaml
@@ -0,0 +1,167 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.PlanViewerControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Background="{DynamicResource BackgroundBrush}">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- Toolbar -->
+        <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" Padding="8,6"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <DockPanel>
+                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                    <Button Content="+" Click="ZoomIn_Click" Width="28" Height="28" Padding="0" FontSize="16"
+                            FontWeight="Bold" ToolTip="Zoom In"/>
+                    <Button Content="&#x2212;" Click="ZoomOut_Click" Width="28" Height="28" Padding="0" FontSize="16"
+                            FontWeight="Bold" Margin="4,0,0,0" ToolTip="Zoom Out"/>
+                    <Button Content="Fit" Click="ZoomFit_Click" Height="28" Padding="8,0" Margin="4,0,0,0"
+                            ToolTip="Zoom to Fit"/>
+                    <TextBlock x:Name="ZoomLevelText" Text="100%" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundMutedBrush}" Margin="8,0,0,0" FontSize="11"/>
+                    <Separator Margin="12,4"/>
+                    <Button Content="Save .sqlplan" Click="SavePlan_Click" Height="28" Padding="8,0"
+                            ToolTip="Save plan as .sqlplan file"/>
+                    <Separator Margin="12,4"/>
+                    <TextBlock x:Name="StatementLabel" Text="Statement:" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundMutedBrush}" Margin="0,0,6,0"
+                               Visibility="Collapsed"/>
+                    <ComboBox x:Name="StatementSelector" MinWidth="200" Height="28"
+                              SelectionChanged="StatementSelector_Changed"
+                              Visibility="Collapsed"/>
+                </StackPanel>
+                <TextBlock x:Name="CostText" DockPanel.Dock="Right" VerticalAlignment="Center"
+                           HorizontalAlignment="Right"
+                           Foreground="{DynamicResource ForegroundMutedBrush}" FontSize="11"/>
+            </DockPanel>
+        </Border>
+
+        <!-- Missing Index Banner -->
+        <Border x:Name="MissingIndexBanner" Grid.Row="1" Padding="10,8"
+                Background="#3D2A0E" Visibility="Collapsed"
+                BorderBrush="#7A5A1E" BorderThickness="0,0,0,1">
+            <StackPanel>
+                <TextBlock Text="Missing Index Suggestions" FontWeight="SemiBold"
+                           Foreground="#FFB347" Margin="0,0,0,4"/>
+                <ItemsControl x:Name="MissingIndexList">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Margin="0,2">
+                                <TextBlock Foreground="#E4E6EB" FontSize="11" TextWrapping="Wrap">
+                                    <Run Text="{Binding Table, Mode=OneWay}" FontWeight="SemiBold"/>
+                                    <Run Text=" — Impact: "/>
+                                    <Run Text="{Binding Impact, StringFormat={}{0:F1}%, Mode=OneWay}" Foreground="#FFB347"/>
+                                </TextBlock>
+                                <TextBlock Text="{Binding CreateStatement, Mode=OneWay}" FontFamily="Consolas" FontSize="10"
+                                           Foreground="{DynamicResource ForegroundMutedBrush}" TextWrapping="Wrap"
+                                           Margin="12,2,0,0"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
+
+        <!-- Warnings Banner -->
+        <Border x:Name="WarningsBanner" Grid.Row="2" Padding="10,6"
+                Background="#3D1A1A" Visibility="Collapsed"
+                BorderBrush="#7A2A2A" BorderThickness="0,0,0,1">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="&#x26A0;" Foreground="#E57373" FontSize="14" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                <TextBlock x:Name="WarningsSummaryText" Foreground="#E57373" VerticalAlignment="Center" FontSize="12"/>
+            </StackPanel>
+        </Border>
+
+        <!-- Query Text (collapsible) -->
+        <Expander Grid.Row="3" x:Name="QueryTextExpander" Header="  Query Text"
+                  IsExpanded="False" Visibility="Collapsed"
+                  Foreground="{DynamicResource ForegroundBrush}"
+                  Background="{DynamicResource BackgroundDarkBrush}"
+                  BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <TextBox x:Name="QueryTextBox" IsReadOnly="True"
+                     FontFamily="Consolas" FontSize="11"
+                     Background="{DynamicResource BackgroundLightBrush}"
+                     Foreground="{DynamicResource ForegroundBrush}"
+                     BorderThickness="0" TextWrapping="Wrap"
+                     MaxHeight="200" VerticalScrollBarVisibility="Auto"
+                     Padding="8,4"/>
+        </Expander>
+
+        <!-- Plan Canvas + Properties Panel -->
+        <Grid Grid.Row="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition x:Name="PropertiesColumn" Width="0"/>
+            </Grid.ColumnDefinitions>
+
+            <!-- Plan Canvas -->
+            <ScrollViewer Grid.Column="0" x:Name="PlanScrollViewer"
+                          HorizontalScrollBarVisibility="Auto"
+                          VerticalScrollBarVisibility="Auto"
+                          Background="{DynamicResource BackgroundBrush}"
+                          PreviewMouseWheel="PlanScrollViewer_PreviewMouseWheel">
+                <Canvas x:Name="PlanCanvas" ClipToBounds="False">
+                    <Canvas.LayoutTransform>
+                        <ScaleTransform x:Name="ZoomTransform" ScaleX="1" ScaleY="1"/>
+                    </Canvas.LayoutTransform>
+                </Canvas>
+            </ScrollViewer>
+
+            <!-- Empty State -->
+            <StackPanel x:Name="EmptyState" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
+                           Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
+                <TextBlock Text="Right-click a query row and choose 'View Plan' to display an execution plan here"
+                           FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
+                           HorizontalAlignment="Center" Margin="0,8,0,0"/>
+            </StackPanel>
+
+            <!-- GridSplitter -->
+            <GridSplitter x:Name="PropertiesSplitter" Grid.Column="1" Width="5"
+                          HorizontalAlignment="Center" VerticalAlignment="Stretch"
+                          Background="{DynamicResource BorderBrush}"
+                          Visibility="Collapsed"/>
+
+            <!-- Properties Panel -->
+            <Border x:Name="PropertiesPanel" Grid.Column="2"
+                    Background="{DynamicResource BackgroundDarkBrush}"
+                    BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1,0,0,0"
+                    Visibility="Collapsed">
+                <DockPanel>
+                    <!-- Header -->
+                    <Border DockPanel.Dock="Top" Padding="10,8"
+                            Background="{DynamicResource BackgroundBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+                        <DockPanel>
+                            <Button DockPanel.Dock="Right" Content="&#x2715;" Click="CloseProperties_Click"
+                                    Width="24" Height="24" Padding="0" FontSize="12"
+                                    VerticalAlignment="Center" ToolTip="Close Properties"
+                                    Background="Transparent" BorderThickness="0"
+                                    Foreground="{DynamicResource ForegroundMutedBrush}"/>
+                            <StackPanel>
+                                <TextBlock x:Name="PropertiesHeader" Text="Operator Properties"
+                                           FontWeight="SemiBold" FontSize="13"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
+                                <TextBlock x:Name="PropertiesSubHeader" FontSize="11"
+                                           Foreground="{DynamicResource ForegroundMutedBrush}"
+                                           Margin="0,2,0,0"/>
+                            </StackPanel>
+                        </DockPanel>
+                    </Border>
+
+                    <!-- Properties Content -->
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
+                                  Padding="0">
+                        <StackPanel x:Name="PropertiesContent" Margin="0"/>
+                    </ScrollViewer>
+                </DockPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Dashboard/Controls/PlanViewerControl.xaml.cs b/Dashboard/Controls/PlanViewerControl.xaml.cs
new file mode 100644
index 00000000..4e1f6e72
--- /dev/null
+++ b/Dashboard/Controls/PlanViewerControl.xaml.cs
@@ -0,0 +1,1485 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Microsoft.Win32;
+using PerformanceMonitorDashboard.Models;
+using PerformanceMonitorDashboard.Services;
+
+using WpfPath = System.Windows.Shapes.Path;
+
+namespace PerformanceMonitorDashboard.Controls;
+
+public partial class PlanViewerControl : UserControl
+{
+    private ParsedPlan? _currentPlan;
+    private PlanStatement? _currentStatement;
+    private double _zoomLevel = 1.0;
+    private const double ZoomStep = 0.15;
+    private const double MinZoom = 0.1;
+    private const double MaxZoom = 3.0;
+    private string _label = "";
+
+    // Node selection
+    private Border? _selectedNodeBorder;
+    private Brush? _selectedNodeOriginalBorder;
+    private Thickness _selectedNodeOriginalThickness;
+
+    // Brushes
+    private static readonly SolidColorBrush SelectionBrush = new(Color.FromRgb(0x4F, 0xA3, 0xFF));
+    private static readonly SolidColorBrush TooltipBgBrush = new(Color.FromRgb(0x1A, 0x1D, 0x23));
+    private static readonly SolidColorBrush TooltipBorderBrush = new(Color.FromRgb(0x3A, 0x3D, 0x45));
+    private static readonly SolidColorBrush TooltipFgBrush = new(Color.FromRgb(0xE4, 0xE6, 0xEB));
+    private static readonly SolidColorBrush MutedBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
+    private static readonly SolidColorBrush EdgeBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
+    private static readonly SolidColorBrush SectionHeaderBrush = new(Color.FromRgb(0x4F, 0xA3, 0xFF));
+    private static readonly SolidColorBrush PropSeparatorBrush = new(Color.FromRgb(0x2A, 0x2D, 0x35));
+
+    // Current property section for collapsible groups
+    private StackPanel? _currentPropertySection;
+
+    public PlanViewerControl()
+    {
+        InitializeComponent();
+    }
+
+    public void LoadPlan(string planXml, string label, string? queryText = null)
+    {
+        _label = label;
+
+        if (!string.IsNullOrEmpty(queryText))
+        {
+            QueryTextBox.Text = queryText;
+            QueryTextExpander.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            QueryTextExpander.Visibility = Visibility.Collapsed;
+        }
+        _currentPlan = ShowPlanParser.Parse(planXml);
+        PlanAnalyzer.Analyze(_currentPlan);
+
+        var allStatements = _currentPlan.Batches
+            .SelectMany(b => b.Statements)
+            .Where(s => s.RootNode != null)
+            .ToList();
+
+        if (allStatements.Count == 0)
+        {
+            EmptyState.Visibility = Visibility.Visible;
+            PlanScrollViewer.Visibility = Visibility.Collapsed;
+            return;
+        }
+
+        EmptyState.Visibility = Visibility.Collapsed;
+        PlanScrollViewer.Visibility = Visibility.Visible;
+
+        // Populate statement selector
+        if (allStatements.Count > 1)
+        {
+            StatementSelector.Items.Clear();
+            for (int i = 0; i < allStatements.Count; i++)
+            {
+                var s = allStatements[i];
+                var text = s.StatementText.Length > 80
+                    ? s.StatementText[..80] + "..."
+                    : s.StatementText;
+                if (string.IsNullOrWhiteSpace(text))
+                    text = $"Statement {i + 1}";
+                StatementSelector.Items.Add(new ComboBoxItem
+                {
+                    Content = $"[{s.StatementSubTreeCost:F4}] {text}",
+                    Tag = i
+                });
+            }
+            StatementSelector.SelectedIndex = 0;
+            StatementLabel.Visibility = Visibility.Visible;
+            StatementSelector.Visibility = Visibility.Visible;
+            CostText.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            StatementLabel.Visibility = Visibility.Collapsed;
+            StatementSelector.Visibility = Visibility.Collapsed;
+            CostText.Visibility = Visibility.Collapsed;
+            RenderStatement(allStatements[0]);
+        }
+    }
+
+    public void Clear()
+    {
+        PlanCanvas.Children.Clear();
+        _currentPlan = null;
+        _currentStatement = null;
+        _selectedNodeBorder = null;
+        EmptyState.Visibility = Visibility.Visible;
+        PlanScrollViewer.Visibility = Visibility.Collapsed;
+        MissingIndexBanner.Visibility = Visibility.Collapsed;
+        WarningsBanner.Visibility = Visibility.Collapsed;
+        StatementLabel.Visibility = Visibility.Collapsed;
+        StatementSelector.Visibility = Visibility.Collapsed;
+        CostText.Text = "";
+        CostText.Visibility = Visibility.Collapsed;
+        ClosePropertiesPanel();
+    }
+
+    private void RenderStatement(PlanStatement statement)
+    {
+        _currentStatement = statement;
+        PlanCanvas.Children.Clear();
+        _selectedNodeBorder = null;
+
+        if (statement.RootNode == null) return;
+
+        // Layout
+        PlanLayoutEngine.Layout(statement);
+        var (width, height) = PlanLayoutEngine.GetExtents(statement.RootNode);
+        PlanCanvas.Width = width;
+        PlanCanvas.Height = height;
+
+        // Render edges first (behind nodes)
+        RenderEdges(statement.RootNode);
+
+        // Render nodes
+        RenderNodes(statement.RootNode);
+
+        // Update banners
+        ShowMissingIndexes(statement.MissingIndexes);
+        ShowWarnings(statement.RootNode);
+
+        // Update cost text
+        CostText.Text = $"Statement Cost: {statement.StatementSubTreeCost:F4}";
+    }
+
+    #region Node Rendering
+
+    private void RenderNodes(PlanNode node)
+    {
+        var visual = CreateNodeVisual(node);
+        Canvas.SetLeft(visual, node.X);
+        Canvas.SetTop(visual, node.Y);
+        PlanCanvas.Children.Add(visual);
+
+        foreach (var child in node.Children)
+            RenderNodes(child);
+    }
+
+    private Border CreateNodeVisual(PlanNode node)
+    {
+        var isExpensive = node.IsExpensive;
+
+        var border = new Border
+        {
+            Width = PlanLayoutEngine.NodeWidth,
+            MinHeight = PlanLayoutEngine.NodeHeightMin,
+            Background = isExpensive
+                ? new SolidColorBrush(Color.FromArgb(0x30, 0xE5, 0x73, 0x73))
+                : (Brush)FindResource("BackgroundLightBrush"),
+            BorderBrush = isExpensive
+                ? Brushes.OrangeRed
+                : (Brush)FindResource("BorderBrush"),
+            BorderThickness = new Thickness(isExpensive ? 2 : 1),
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(6, 4, 6, 4),
+            ToolTip = BuildNodeTooltip(node),
+            Cursor = Cursors.Hand,
+            SnapsToDevicePixels = true,
+            Tag = node
+        };
+
+        // Click to select + show properties
+        border.MouseLeftButtonUp += Node_Click;
+
+        // Right-click context menu
+        border.ContextMenu = BuildNodeContextMenu(node);
+
+        var stack = new StackPanel { HorizontalAlignment = HorizontalAlignment.Center };
+
+        // Icon row: icon + optional warning/parallel indicators
+        var iconRow = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center };
+
+        var icon = PlanIconMapper.GetIcon(node.IconName);
+        if (icon != null)
+        {
+            iconRow.Children.Add(new Image
+            {
+                Source = icon,
+                Width = 32,
+                Height = 32,
+                Margin = new Thickness(0, 0, 0, 2)
+            });
+        }
+
+        // Warning indicator badge (orange triangle with !)
+        if (node.HasWarnings)
+        {
+            var warnBadge = new Grid
+            {
+                Width = 20, Height = 20,
+                Margin = new Thickness(4, 0, 0, 0),
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            warnBadge.Children.Add(new Polygon
+            {
+                Points = new PointCollection
+                {
+                    new Point(10, 0), new Point(20, 18), new Point(0, 18)
+                },
+                Fill = Brushes.Orange
+            });
+            warnBadge.Children.Add(new TextBlock
+            {
+                Text = "!",
+                FontSize = 12,
+                FontWeight = FontWeights.ExtraBold,
+                Foreground = Brushes.White,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 3, 0, 0)
+            });
+            iconRow.Children.Add(warnBadge);
+        }
+
+        // Parallel indicator badge (amber circle with arrows)
+        if (node.Parallel)
+        {
+            var parBadge = new Grid
+            {
+                Width = 20, Height = 20,
+                Margin = new Thickness(4, 0, 0, 0),
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            parBadge.Children.Add(new Ellipse
+            {
+                Width = 20, Height = 20,
+                Fill = new SolidColorBrush(Color.FromRgb(0xFF, 0xC1, 0x07))
+            });
+            parBadge.Children.Add(new TextBlock
+            {
+                Text = "\u21C6",
+                FontSize = 12,
+                FontWeight = FontWeights.Bold,
+                Foreground = new SolidColorBrush(Color.FromRgb(0x33, 0x33, 0x33)),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            });
+            iconRow.Children.Add(parBadge);
+        }
+
+        stack.Children.Add(iconRow);
+
+        // Operator name — use full name, let TextTrimming handle overflow
+        stack.Children.Add(new TextBlock
+        {
+            Text = node.PhysicalOp,
+            FontSize = 10,
+            FontWeight = FontWeights.SemiBold,
+            Foreground = (Brush)FindResource("ForegroundBrush"),
+            TextAlignment = TextAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            MaxWidth = PlanLayoutEngine.NodeWidth - 16,
+            HorizontalAlignment = HorizontalAlignment.Center
+        });
+
+        // Cost percentage
+        var costColor = node.CostPercent >= 50 ? Brushes.OrangeRed
+            : node.CostPercent >= 25 ? Brushes.Orange
+            : (Brush)FindResource("ForegroundBrush");
+
+        stack.Children.Add(new TextBlock
+        {
+            Text = $"Cost: {node.CostPercent}%",
+            FontSize = 10,
+            Foreground = costColor,
+            TextAlignment = TextAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center
+        });
+
+        // Actual plan stats: elapsed time, CPU time, and row counts
+        if (node.HasActualStats)
+        {
+            var fgBrush = (Brush)FindResource("ForegroundBrush");
+
+            // Elapsed time — red if >= 1 second
+            var elapsedSec = node.ActualElapsedMs / 1000.0;
+            var elapsedBrush = elapsedSec >= 1.0 ? Brushes.OrangeRed : fgBrush;
+            stack.Children.Add(new TextBlock
+            {
+                Text = $"{elapsedSec:F3}s",
+                FontSize = 10,
+                Foreground = elapsedBrush,
+                TextAlignment = TextAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+
+            // CPU time — red if >= 1 second
+            var cpuSec = node.ActualCPUMs / 1000.0;
+            var cpuBrush = cpuSec >= 1.0 ? Brushes.OrangeRed : fgBrush;
+            stack.Children.Add(new TextBlock
+            {
+                Text = $"CPU: {cpuSec:F3}s",
+                FontSize = 9,
+                Foreground = cpuBrush,
+                TextAlignment = TextAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+
+            // Actual rows of Estimated rows (accuracy %) — red if off by 10x+
+            var estRows = node.EstimateRows;
+            var accuracyRatio = estRows > 0 ? node.ActualRows / estRows : (node.ActualRows > 0 ? double.MaxValue : 1.0);
+            var rowBrush = (accuracyRatio < 0.1 || accuracyRatio > 10.0) ? Brushes.OrangeRed : fgBrush;
+            var accuracy = estRows > 0
+                ? $" ({accuracyRatio * 100:F0}%)"
+                : "";
+            stack.Children.Add(new TextBlock
+            {
+                Text = $"{node.ActualRows:N0} of {estRows:N0}{accuracy}",
+                FontSize = 9,
+                Foreground = rowBrush,
+                TextAlignment = TextAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                MaxWidth = PlanLayoutEngine.NodeWidth - 16
+            });
+        }
+
+        // Object name — show full object name, use ellipsis for overflow
+        if (!string.IsNullOrEmpty(node.ObjectName))
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = node.FullObjectName ?? node.ObjectName,
+                FontSize = 9,
+                Foreground = (Brush)FindResource("ForegroundBrush"),
+                TextAlignment = TextAlignment.Center,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                MaxWidth = PlanLayoutEngine.NodeWidth - 16,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                ToolTip = node.FullObjectName ?? node.ObjectName
+            });
+        }
+
+        border.Child = stack;
+        return border;
+    }
+
+    #endregion
+
+    #region Edge Rendering
+
+    private void RenderEdges(PlanNode node)
+    {
+        foreach (var child in node.Children)
+        {
+            var path = CreateElbowConnector(node, child);
+            PlanCanvas.Children.Add(path);
+
+            RenderEdges(child);
+        }
+    }
+
+    private WpfPath CreateElbowConnector(PlanNode parent, PlanNode child)
+    {
+        var parentRight = parent.X + PlanLayoutEngine.NodeWidth;
+        var parentCenterY = parent.Y + PlanLayoutEngine.GetNodeHeight(parent) / 2;
+        var childLeft = child.X;
+        var childCenterY = child.Y + PlanLayoutEngine.GetNodeHeight(child) / 2;
+
+        // Arrow thickness based on row estimate (logarithmic)
+        var rows = child.HasActualStats ? child.ActualRows : child.EstimateRows;
+        var thickness = Math.Max(2, Math.Min(Math.Floor(Math.Log(Math.Max(1, rows))), 12));
+
+        var midX = (parentRight + childLeft) / 2;
+
+        var geometry = new PathGeometry();
+        var figure = new PathFigure
+        {
+            StartPoint = new Point(parentRight, parentCenterY),
+            IsClosed = false
+        };
+        figure.Segments.Add(new LineSegment(new Point(midX, parentCenterY), true));
+        figure.Segments.Add(new LineSegment(new Point(midX, childCenterY), true));
+        figure.Segments.Add(new LineSegment(new Point(childLeft, childCenterY), true));
+        geometry.Figures.Add(figure);
+
+        var rowText = child.HasActualStats
+            ? $"Actual Rows: {child.ActualRows:N0}"
+            : $"Estimated Rows: {child.EstimateRows:N0}";
+
+        return new WpfPath
+        {
+            Data = geometry,
+            Stroke = EdgeBrush,
+            StrokeThickness = thickness,
+            StrokeLineJoin = PenLineJoin.Round,
+            ToolTip = rowText,
+            SnapsToDevicePixels = true
+        };
+    }
+
+    #endregion
+
+    #region Node Selection & Properties Panel
+
+    private void Node_Click(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is Border border && border.Tag is PlanNode node)
+        {
+            SelectNode(border, node);
+            e.Handled = true;
+        }
+    }
+
+    private void SelectNode(Border border, PlanNode node)
+    {
+        // Deselect previous
+        if (_selectedNodeBorder != null)
+        {
+            _selectedNodeBorder.BorderBrush = _selectedNodeOriginalBorder;
+            _selectedNodeBorder.BorderThickness = _selectedNodeOriginalThickness;
+        }
+
+        // Select new
+        _selectedNodeOriginalBorder = border.BorderBrush;
+        _selectedNodeOriginalThickness = border.BorderThickness;
+        _selectedNodeBorder = border;
+        border.BorderBrush = SelectionBrush;
+        border.BorderThickness = new Thickness(2);
+
+        ShowPropertiesPanel(node);
+    }
+
+    private ContextMenu BuildNodeContextMenu(PlanNode node)
+    {
+        var menu = new ContextMenu();
+
+        var propsItem = new MenuItem { Header = "Properties" };
+        propsItem.Click += (_, _) =>
+        {
+            // Find the border for this node by checking Tags
+            foreach (var child in PlanCanvas.Children)
+            {
+                if (child is Border b && b.Tag == node)
+                {
+                    SelectNode(b, node);
+                    break;
+                }
+            }
+        };
+        menu.Items.Add(propsItem);
+
+        menu.Items.Add(new Separator());
+
+        var copyOpItem = new MenuItem { Header = "Copy Operator Name" };
+        copyOpItem.Click += (_, _) => Clipboard.SetDataObject(node.PhysicalOp, false);
+        menu.Items.Add(copyOpItem);
+
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            var copyObjItem = new MenuItem { Header = "Copy Object Name" };
+            copyObjItem.Click += (_, _) => Clipboard.SetDataObject(node.FullObjectName, false);
+            menu.Items.Add(copyObjItem);
+        }
+
+        if (!string.IsNullOrEmpty(node.Predicate))
+        {
+            var copyPredItem = new MenuItem { Header = "Copy Predicate" };
+            copyPredItem.Click += (_, _) => Clipboard.SetDataObject(node.Predicate, false);
+            menu.Items.Add(copyPredItem);
+        }
+
+        if (!string.IsNullOrEmpty(node.SeekPredicates))
+        {
+            var copySeekItem = new MenuItem { Header = "Copy Seek Predicate" };
+            copySeekItem.Click += (_, _) => Clipboard.SetDataObject(node.SeekPredicates, false);
+            menu.Items.Add(copySeekItem);
+        }
+
+        return menu;
+    }
+
+    private void ShowPropertiesPanel(PlanNode node)
+    {
+        PropertiesContent.Children.Clear();
+        _currentPropertySection = null;
+
+        // Header
+        var headerText = node.PhysicalOp;
+        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp))
+            headerText += $" ({node.LogicalOp})";
+        PropertiesHeader.Text = headerText;
+        PropertiesSubHeader.Text = $"Node ID: {node.NodeId}";
+
+        // === General Section ===
+        AddPropertySection("General");
+        AddPropertyRow("Physical Operation", node.PhysicalOp);
+        AddPropertyRow("Logical Operation", node.LogicalOp);
+        AddPropertyRow("Node ID", $"{node.NodeId}");
+        if (!string.IsNullOrEmpty(node.ExecutionMode))
+            AddPropertyRow("Execution Mode", node.ExecutionMode);
+        if (!string.IsNullOrEmpty(node.ActualExecutionMode) && node.ActualExecutionMode != node.ExecutionMode)
+            AddPropertyRow("Actual Exec Mode", node.ActualExecutionMode);
+        AddPropertyRow("Parallel", node.Parallel ? "True" : "False");
+        if (node.Partitioned)
+            AddPropertyRow("Partitioned", "True");
+        if (node.EstimatedDOP > 0)
+            AddPropertyRow("Estimated DOP", $"{node.EstimatedDOP}");
+
+        // Scan/seek-related properties — always show for operators that have object references
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            AddPropertyRow("Ordered", node.Ordered ? "True" : "False");
+            if (!string.IsNullOrEmpty(node.ScanDirection))
+                AddPropertyRow("Scan Direction", node.ScanDirection);
+            AddPropertyRow("Forced Index", node.ForcedIndex ? "True" : "False");
+            AddPropertyRow("ForceScan", node.ForceScan ? "True" : "False");
+            AddPropertyRow("ForceSeek", node.ForceSeek ? "True" : "False");
+            AddPropertyRow("NoExpandHint", node.NoExpandHint ? "True" : "False");
+            if (node.Lookup)
+                AddPropertyRow("Lookup", "True");
+            if (node.DynamicSeek)
+                AddPropertyRow("Dynamic Seek", "True");
+        }
+
+        if (!string.IsNullOrEmpty(node.StorageType))
+            AddPropertyRow("Storage", node.StorageType);
+        if (node.IsAdaptive)
+            AddPropertyRow("Adaptive", "True");
+
+        // === Object Section ===
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            AddPropertySection("Object");
+            AddPropertyRow("Full Name", node.FullObjectName, isCode: true);
+            if (!string.IsNullOrEmpty(node.DatabaseName))
+                AddPropertyRow("Database", node.DatabaseName);
+            if (!string.IsNullOrEmpty(node.IndexName))
+                AddPropertyRow("Index", node.IndexName);
+        }
+
+        // === Operator Details Section ===
+        var hasOperatorDetails = !string.IsNullOrEmpty(node.OrderBy)
+            || !string.IsNullOrEmpty(node.TopExpression)
+            || !string.IsNullOrEmpty(node.GroupBy)
+            || !string.IsNullOrEmpty(node.PartitionColumns)
+            || !string.IsNullOrEmpty(node.HashKeys)
+            || !string.IsNullOrEmpty(node.SegmentColumn)
+            || !string.IsNullOrEmpty(node.DefinedValues)
+            || !string.IsNullOrEmpty(node.OuterReferences)
+            || !string.IsNullOrEmpty(node.InnerSideJoinColumns)
+            || !string.IsNullOrEmpty(node.OuterSideJoinColumns)
+            || !string.IsNullOrEmpty(node.ActionColumn)
+            || node.ManyToMany || node.BitmapCreator
+            || node.SortDistinct || node.StartupExpression
+            || node.NLOptimized || node.WithOrderedPrefetch || node.WithUnorderedPrefetch
+            || node.WithTies || node.Remoting || node.LocalParallelism
+            || node.SpoolStack || node.DMLRequestSort
+            || !string.IsNullOrEmpty(node.OffsetExpression) || node.TopRows > 0;
+
+        if (hasOperatorDetails)
+        {
+            AddPropertySection("Operator Details");
+            if (!string.IsNullOrEmpty(node.OrderBy))
+                AddPropertyRow("Order By", node.OrderBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.TopExpression))
+            {
+                var topText = node.TopExpression;
+                if (node.IsPercent) topText += " PERCENT";
+                if (node.WithTies) topText += " WITH TIES";
+                AddPropertyRow("Top", topText);
+            }
+            if (node.SortDistinct)
+                AddPropertyRow("Distinct Sort", "True");
+            if (node.StartupExpression)
+                AddPropertyRow("Startup Expression", "True");
+            if (node.NLOptimized)
+                AddPropertyRow("Optimized", "True");
+            if (node.WithOrderedPrefetch)
+                AddPropertyRow("Ordered Prefetch", "True");
+            if (node.WithUnorderedPrefetch)
+                AddPropertyRow("Unordered Prefetch", "True");
+            if (node.BitmapCreator)
+                AddPropertyRow("Bitmap Creator", "True");
+            if (node.Remoting)
+                AddPropertyRow("Remoting", "True");
+            if (node.LocalParallelism)
+                AddPropertyRow("Local Parallelism", "True");
+            if (!string.IsNullOrEmpty(node.GroupBy))
+                AddPropertyRow("Group By", node.GroupBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.PartitionColumns))
+                AddPropertyRow("Partition Columns", node.PartitionColumns, isCode: true);
+            if (!string.IsNullOrEmpty(node.HashKeys))
+                AddPropertyRow("Hash Keys", node.HashKeys, isCode: true);
+            if (!string.IsNullOrEmpty(node.OffsetExpression))
+                AddPropertyRow("Offset", node.OffsetExpression);
+            if (node.TopRows > 0)
+                AddPropertyRow("Rows", $"{node.TopRows}");
+            if (node.SpoolStack)
+                AddPropertyRow("Stack Spool", "True");
+            if (node.PrimaryNodeId > 0)
+                AddPropertyRow("Primary Node Id", $"{node.PrimaryNodeId}");
+            if (node.DMLRequestSort)
+                AddPropertyRow("DML Request Sort", "True");
+            if (!string.IsNullOrEmpty(node.ActionColumn))
+                AddPropertyRow("Action Column", node.ActionColumn, isCode: true);
+            if (!string.IsNullOrEmpty(node.SegmentColumn))
+                AddPropertyRow("Segment Column", node.SegmentColumn, isCode: true);
+            if (!string.IsNullOrEmpty(node.DefinedValues))
+                AddPropertyRow("Defined Values", node.DefinedValues, isCode: true);
+            if (!string.IsNullOrEmpty(node.OuterReferences))
+                AddPropertyRow("Outer References", node.OuterReferences, isCode: true);
+            if (!string.IsNullOrEmpty(node.InnerSideJoinColumns))
+                AddPropertyRow("Inner Join Cols", node.InnerSideJoinColumns, isCode: true);
+            if (!string.IsNullOrEmpty(node.OuterSideJoinColumns))
+                AddPropertyRow("Outer Join Cols", node.OuterSideJoinColumns, isCode: true);
+            if (node.ManyToMany)
+                AddPropertyRow("Many to Many", "True");
+        }
+
+        // === Adaptive Join Section ===
+        if (node.IsAdaptive)
+        {
+            AddPropertySection("Adaptive Join");
+            if (!string.IsNullOrEmpty(node.EstimatedJoinType))
+                AddPropertyRow("Est. Join Type", node.EstimatedJoinType);
+            if (!string.IsNullOrEmpty(node.ActualJoinType))
+                AddPropertyRow("Actual Join Type", node.ActualJoinType);
+            if (node.AdaptiveThresholdRows > 0)
+                AddPropertyRow("Threshold Rows", $"{node.AdaptiveThresholdRows:N1}");
+        }
+
+        // === Estimated Costs Section ===
+        AddPropertySection("Estimated Costs");
+        AddPropertyRow("Operator Cost", $"{node.EstimatedOperatorCost:F6} ({node.CostPercent}%)");
+        AddPropertyRow("Subtree Cost", $"{node.EstimatedTotalSubtreeCost:F6}");
+        AddPropertyRow("I/O Cost", $"{node.EstimateIO:F6}");
+        AddPropertyRow("CPU Cost", $"{node.EstimateCPU:F6}");
+
+        // === Estimated Rows Section ===
+        AddPropertySection("Estimated Rows");
+        var estExecs = 1 + node.EstimateRebinds;
+        AddPropertyRow("Est. Executions", $"{estExecs:N0}");
+        AddPropertyRow("Est. Rows Per Exec", $"{node.EstimateRows:N1}");
+        AddPropertyRow("Est. Rows All Execs", $"{node.EstimateRows * Math.Max(1, estExecs):N1}");
+        if (node.EstimatedRowsRead > 0)
+            AddPropertyRow("Est. Rows to Read", $"{node.EstimatedRowsRead:N1}");
+        if (node.TableCardinality > 0)
+            AddPropertyRow("Table Cardinality", $"{node.TableCardinality:N0}");
+        AddPropertyRow("Avg Row Size", $"{node.EstimatedRowSize} B");
+        AddPropertyRow("Est. Rebinds", $"{node.EstimateRebinds:N1}");
+        AddPropertyRow("Est. Rewinds", $"{node.EstimateRewinds:N1}");
+
+        // === Actual Stats Section (if actual plan) ===
+        if (node.HasActualStats)
+        {
+            AddPropertySection("Actual Statistics");
+            AddPropertyRow("Actual Rows", $"{node.ActualRows:N0}");
+            if (node.ActualRowsRead > 0)
+                AddPropertyRow("Actual Rows Read", $"{node.ActualRowsRead:N0}");
+            AddPropertyRow("Actual Executions", $"{node.ActualExecutions:N0}");
+            if (node.ActualRebinds > 0)
+                AddPropertyRow("Actual Rebinds", $"{node.ActualRebinds:N0}");
+            if (node.ActualRewinds > 0)
+                AddPropertyRow("Actual Rewinds", $"{node.ActualRewinds:N0}");
+
+            // Runtime partition summary
+            if (node.PartitionsAccessed > 0)
+            {
+                AddPropertyRow("Partitions Accessed", $"{node.PartitionsAccessed}");
+                if (!string.IsNullOrEmpty(node.PartitionRanges))
+                    AddPropertyRow("Partition Ranges", node.PartitionRanges);
+            }
+
+            // Timing
+            if (node.ActualElapsedMs > 0 || node.ActualCPUMs > 0
+                || node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+            {
+                AddPropertySection("Actual Timing");
+                if (node.ActualElapsedMs > 0)
+                    AddPropertyRow("Elapsed Time", $"{node.ActualElapsedMs:N0} ms");
+                if (node.ActualCPUMs > 0)
+                    AddPropertyRow("CPU Time", $"{node.ActualCPUMs:N0} ms");
+                if (node.UdfElapsedTimeUs > 0)
+                    AddPropertyRow("UDF Elapsed", $"{node.UdfElapsedTimeUs:N0} us");
+                if (node.UdfCpuTimeUs > 0)
+                    AddPropertyRow("UDF CPU", $"{node.UdfCpuTimeUs:N0} us");
+            }
+
+            // I/O
+            var hasIo = node.ActualLogicalReads > 0 || node.ActualPhysicalReads > 0
+                || node.ActualScans > 0 || node.ActualReadAheads > 0
+                || node.ActualSegmentReads > 0 || node.ActualSegmentSkips > 0;
+            if (hasIo)
+            {
+                AddPropertySection("Actual I/O");
+                AddPropertyRow("Logical Reads", $"{node.ActualLogicalReads:N0}");
+                if (node.ActualPhysicalReads > 0)
+                    AddPropertyRow("Physical Reads", $"{node.ActualPhysicalReads:N0}");
+                if (node.ActualScans > 0)
+                    AddPropertyRow("Scans", $"{node.ActualScans:N0}");
+                if (node.ActualReadAheads > 0)
+                    AddPropertyRow("Read-Ahead Reads", $"{node.ActualReadAheads:N0}");
+                if (node.ActualSegmentReads > 0)
+                    AddPropertyRow("Segment Reads", $"{node.ActualSegmentReads:N0}");
+                if (node.ActualSegmentSkips > 0)
+                    AddPropertyRow("Segment Skips", $"{node.ActualSegmentSkips:N0}");
+            }
+
+            // LOB I/O
+            var hasLobIo = node.ActualLobLogicalReads > 0 || node.ActualLobPhysicalReads > 0
+                || node.ActualLobReadAheads > 0;
+            if (hasLobIo)
+            {
+                AddPropertySection("Actual LOB I/O");
+                if (node.ActualLobLogicalReads > 0)
+                    AddPropertyRow("LOB Logical Reads", $"{node.ActualLobLogicalReads:N0}");
+                if (node.ActualLobPhysicalReads > 0)
+                    AddPropertyRow("LOB Physical Reads", $"{node.ActualLobPhysicalReads:N0}");
+                if (node.ActualLobReadAheads > 0)
+                    AddPropertyRow("LOB Read-Aheads", $"{node.ActualLobReadAheads:N0}");
+            }
+        }
+
+        // === Predicates Section ===
+        var hasPredicates = !string.IsNullOrEmpty(node.SeekPredicates) || !string.IsNullOrEmpty(node.Predicate)
+            || !string.IsNullOrEmpty(node.HashKeysProbe) || !string.IsNullOrEmpty(node.HashKeysBuild)
+            || !string.IsNullOrEmpty(node.BuildResidual) || !string.IsNullOrEmpty(node.ProbeResidual)
+            || !string.IsNullOrEmpty(node.MergeResidual) || !string.IsNullOrEmpty(node.PassThru)
+            || !string.IsNullOrEmpty(node.SetPredicate);
+        if (hasPredicates)
+        {
+            AddPropertySection("Predicates");
+            if (!string.IsNullOrEmpty(node.SeekPredicates))
+                AddPropertyRow("Seek Predicate", node.SeekPredicates, isCode: true);
+            if (!string.IsNullOrEmpty(node.Predicate))
+                AddPropertyRow("Predicate", node.Predicate, isCode: true);
+            if (!string.IsNullOrEmpty(node.HashKeysBuild))
+                AddPropertyRow("Hash Keys (Build)", node.HashKeysBuild, isCode: true);
+            if (!string.IsNullOrEmpty(node.HashKeysProbe))
+                AddPropertyRow("Hash Keys (Probe)", node.HashKeysProbe, isCode: true);
+            if (!string.IsNullOrEmpty(node.BuildResidual))
+                AddPropertyRow("Build Residual", node.BuildResidual, isCode: true);
+            if (!string.IsNullOrEmpty(node.ProbeResidual))
+                AddPropertyRow("Probe Residual", node.ProbeResidual, isCode: true);
+            if (!string.IsNullOrEmpty(node.MergeResidual))
+                AddPropertyRow("Merge Residual", node.MergeResidual, isCode: true);
+            if (!string.IsNullOrEmpty(node.PassThru))
+                AddPropertyRow("Pass Through", node.PassThru, isCode: true);
+            if (!string.IsNullOrEmpty(node.SetPredicate))
+                AddPropertyRow("Set Predicate", node.SetPredicate, isCode: true);
+        }
+
+        // === Output Columns ===
+        if (!string.IsNullOrEmpty(node.OutputColumns))
+        {
+            AddPropertySection("Output");
+            AddPropertyRow("Columns", node.OutputColumns, isCode: true);
+        }
+
+        // === Memory ===
+        if (node.MemoryGrantKB > 0 || node.DesiredMemoryKB > 0 || node.MaxUsedMemoryKB > 0
+            || node.MemoryFractionInput > 0 || node.MemoryFractionOutput > 0)
+        {
+            AddPropertySection("Memory");
+            if (node.MemoryGrantKB > 0) AddPropertyRow("Granted", $"{node.MemoryGrantKB:N0} KB");
+            if (node.DesiredMemoryKB > 0) AddPropertyRow("Desired", $"{node.DesiredMemoryKB:N0} KB");
+            if (node.MaxUsedMemoryKB > 0) AddPropertyRow("Max Used", $"{node.MaxUsedMemoryKB:N0} KB");
+            if (node.MemoryFractionInput > 0) AddPropertyRow("Fraction Input", $"{node.MemoryFractionInput:F4}");
+            if (node.MemoryFractionOutput > 0) AddPropertyRow("Fraction Output", $"{node.MemoryFractionOutput:F4}");
+        }
+
+        // === Root node only: statement-level sections ===
+        if (node.Parent == null && _currentStatement != null)
+        {
+            var s = _currentStatement;
+
+            // === Statement Text ===
+            if (!string.IsNullOrEmpty(s.StatementText))
+            {
+                AddPropertySection("Statement");
+                AddPropertyRow("Text", s.StatementText, isCode: true);
+                if (!string.IsNullOrEmpty(s.ParameterizedText) && s.ParameterizedText != s.StatementText)
+                    AddPropertyRow("Parameterized", s.ParameterizedText, isCode: true);
+            }
+
+            // === Cursor Info ===
+            if (!string.IsNullOrEmpty(s.CursorName))
+            {
+                AddPropertySection("Cursor Info");
+                AddPropertyRow("Cursor Name", s.CursorName);
+                if (!string.IsNullOrEmpty(s.CursorActualType))
+                    AddPropertyRow("Actual Type", s.CursorActualType);
+                if (!string.IsNullOrEmpty(s.CursorRequestedType))
+                    AddPropertyRow("Requested Type", s.CursorRequestedType);
+                if (!string.IsNullOrEmpty(s.CursorConcurrency))
+                    AddPropertyRow("Concurrency", s.CursorConcurrency);
+                AddPropertyRow("Forward Only", s.CursorForwardOnly ? "True" : "False");
+            }
+
+            // === Statement Memory Grant ===
+            if (s.MemoryGrant != null)
+            {
+                var mg = s.MemoryGrant;
+                AddPropertySection("Memory Grant Info");
+                AddPropertyRow("Granted", $"{mg.GrantedMemoryKB:N0} KB");
+                AddPropertyRow("Max Used", $"{mg.MaxUsedMemoryKB:N0} KB");
+                AddPropertyRow("Requested", $"{mg.RequestedMemoryKB:N0} KB");
+                AddPropertyRow("Desired", $"{mg.DesiredMemoryKB:N0} KB");
+                AddPropertyRow("Required", $"{mg.RequiredMemoryKB:N0} KB");
+                AddPropertyRow("Serial Required", $"{mg.SerialRequiredMemoryKB:N0} KB");
+                AddPropertyRow("Serial Desired", $"{mg.SerialDesiredMemoryKB:N0} KB");
+                if (mg.GrantWaitTimeMs > 0)
+                    AddPropertyRow("Grant Wait Time", $"{mg.GrantWaitTimeMs:N0} ms");
+                if (mg.LastRequestedMemoryKB > 0)
+                    AddPropertyRow("Last Requested", $"{mg.LastRequestedMemoryKB:N0} KB");
+                if (!string.IsNullOrEmpty(mg.IsMemoryGrantFeedbackAdjusted))
+                    AddPropertyRow("Feedback Adjusted", mg.IsMemoryGrantFeedbackAdjusted);
+            }
+
+            // === Statement Info ===
+            AddPropertySection("Statement Info");
+            if (!string.IsNullOrEmpty(s.StatementOptmLevel))
+                AddPropertyRow("Optimization Level", s.StatementOptmLevel);
+            if (!string.IsNullOrEmpty(s.StatementOptmEarlyAbortReason))
+                AddPropertyRow("Early Abort Reason", s.StatementOptmEarlyAbortReason);
+            if (s.CardinalityEstimationModelVersion > 0)
+                AddPropertyRow("CE Model Version", $"{s.CardinalityEstimationModelVersion}");
+            if (s.DegreeOfParallelism > 0)
+                AddPropertyRow("DOP", $"{s.DegreeOfParallelism}");
+            if (s.EffectiveDOP > 0)
+                AddPropertyRow("Effective DOP", $"{s.EffectiveDOP}");
+            if (!string.IsNullOrEmpty(s.DOPFeedbackAdjusted))
+                AddPropertyRow("DOP Feedback", s.DOPFeedbackAdjusted);
+            if (!string.IsNullOrEmpty(s.NonParallelPlanReason))
+                AddPropertyRow("Non-Parallel Reason", s.NonParallelPlanReason);
+            if (s.MaxQueryMemoryKB > 0)
+                AddPropertyRow("Max Query Memory", $"{s.MaxQueryMemoryKB:N0} KB");
+            AddPropertyRow("Compile Time", $"{s.CompileTimeMs:N0} ms");
+            AddPropertyRow("Compile CPU", $"{s.CompileCPUMs:N0} ms");
+            AddPropertyRow("Compile Memory", $"{s.CompileMemoryKB:N0} KB");
+            if (s.CachedPlanSizeKB > 0)
+                AddPropertyRow("Cached Plan Size", $"{s.CachedPlanSizeKB:N0} KB");
+            AddPropertyRow("Retrieved From Cache", s.RetrievedFromCache ? "True" : "False");
+            AddPropertyRow("Batch Mode On RowStore", s.BatchModeOnRowStoreUsed ? "True" : "False");
+            AddPropertyRow("Security Policy", s.SecurityPolicyApplied ? "True" : "False");
+            AddPropertyRow("Parameterization Type", $"{s.StatementParameterizationType}");
+            if (!string.IsNullOrEmpty(s.QueryHash))
+                AddPropertyRow("Query Hash", s.QueryHash, isCode: true);
+            if (!string.IsNullOrEmpty(s.QueryPlanHash))
+                AddPropertyRow("Plan Hash", s.QueryPlanHash, isCode: true);
+            if (!string.IsNullOrEmpty(s.StatementSqlHandle))
+                AddPropertyRow("SQL Handle", s.StatementSqlHandle, isCode: true);
+            AddPropertyRow("DB Settings Id", $"{s.DatabaseContextSettingsId}");
+            AddPropertyRow("Parent Object Id", $"{s.ParentObjectId}");
+
+            // Plan Guide
+            if (!string.IsNullOrEmpty(s.PlanGuideName))
+            {
+                AddPropertyRow("Plan Guide", s.PlanGuideName);
+                if (!string.IsNullOrEmpty(s.PlanGuideDB))
+                    AddPropertyRow("Plan Guide DB", s.PlanGuideDB);
+            }
+            if (s.UsePlan)
+                AddPropertyRow("USE PLAN", "True");
+
+            // Query Store Hints
+            if (s.QueryStoreStatementHintId > 0)
+            {
+                AddPropertyRow("QS Hint Id", $"{s.QueryStoreStatementHintId}");
+                if (!string.IsNullOrEmpty(s.QueryStoreStatementHintText))
+                    AddPropertyRow("QS Hint", s.QueryStoreStatementHintText, isCode: true);
+                if (!string.IsNullOrEmpty(s.QueryStoreStatementHintSource))
+                    AddPropertyRow("QS Hint Source", s.QueryStoreStatementHintSource);
+            }
+
+            // === Set Options ===
+            if (s.SetOptions != null)
+            {
+                var so = s.SetOptions;
+                AddPropertySection("Set Options");
+                AddPropertyRow("ANSI_NULLS", so.AnsiNulls ? "True" : "False");
+                AddPropertyRow("ANSI_PADDING", so.AnsiPadding ? "True" : "False");
+                AddPropertyRow("ANSI_WARNINGS", so.AnsiWarnings ? "True" : "False");
+                AddPropertyRow("ARITHABORT", so.ArithAbort ? "True" : "False");
+                AddPropertyRow("CONCAT_NULL", so.ConcatNullYieldsNull ? "True" : "False");
+                AddPropertyRow("NUMERIC_ROUNDABORT", so.NumericRoundAbort ? "True" : "False");
+                AddPropertyRow("QUOTED_IDENTIFIER", so.QuotedIdentifier ? "True" : "False");
+            }
+
+            // === Optimizer Hardware Properties ===
+            if (s.HardwareProperties != null)
+            {
+                var hw = s.HardwareProperties;
+                AddPropertySection("Hardware Properties");
+                AddPropertyRow("Available Memory", $"{hw.EstimatedAvailableMemoryGrant:N0} KB");
+                AddPropertyRow("Pages Cached", $"{hw.EstimatedPagesCached:N0}");
+                AddPropertyRow("Available DOP", $"{hw.EstimatedAvailableDOP}");
+                if (hw.MaxCompileMemory > 0)
+                    AddPropertyRow("Max Compile Memory", $"{hw.MaxCompileMemory:N0} KB");
+            }
+
+            // === Optimizer Stats Usage ===
+            if (s.StatsUsage.Count > 0)
+            {
+                AddPropertySection("Statistics Used");
+                foreach (var stat in s.StatsUsage)
+                {
+                    var statLabel = !string.IsNullOrEmpty(stat.TableName)
+                        ? $"{stat.TableName}.{stat.StatisticsName}"
+                        : stat.StatisticsName;
+                    var statDetail = $"Modified: {stat.ModificationCount:N0}, Sampled: {stat.SamplingPercent:F1}%";
+                    if (!string.IsNullOrEmpty(stat.LastUpdate))
+                        statDetail += $", Updated: {stat.LastUpdate}";
+                    AddPropertyRow(statLabel, statDetail);
+                }
+            }
+
+            // === Parameters ===
+            if (s.Parameters.Count > 0)
+            {
+                AddPropertySection("Parameters");
+                foreach (var p in s.Parameters)
+                {
+                    var paramText = p.DataType;
+                    if (!string.IsNullOrEmpty(p.CompiledValue))
+                        paramText += $", Compiled: {p.CompiledValue}";
+                    if (!string.IsNullOrEmpty(p.RuntimeValue))
+                        paramText += $", Runtime: {p.RuntimeValue}";
+                    AddPropertyRow(p.Name, paramText);
+                }
+            }
+
+            // === Query Time Stats (actual plans) ===
+            if (s.QueryTimeStats != null)
+            {
+                AddPropertySection("Query Time Stats");
+                AddPropertyRow("CPU Time", $"{s.QueryTimeStats.CpuTimeMs:N0} ms");
+                AddPropertyRow("Elapsed Time", $"{s.QueryTimeStats.ElapsedTimeMs:N0} ms");
+            }
+
+            // === Thread Stats (actual plans) ===
+            if (s.ThreadStats != null)
+            {
+                AddPropertySection("Thread Stats");
+                AddPropertyRow("Branches", $"{s.ThreadStats.Branches}");
+                AddPropertyRow("Used Threads", $"{s.ThreadStats.UsedThreads}");
+            }
+
+            // === Wait Stats (actual plans) ===
+            if (s.WaitStats.Count > 0)
+            {
+                AddPropertySection("Wait Stats");
+                foreach (var w in s.WaitStats)
+                    AddPropertyRow(w.WaitType, $"{w.WaitTimeMs:N0} ms ({w.WaitCount:N0} waits)");
+            }
+
+            // === Trace Flags ===
+            if (s.TraceFlags.Count > 0)
+            {
+                AddPropertySection("Trace Flags");
+                foreach (var tf in s.TraceFlags)
+                {
+                    var tfLabel = $"TF {tf.Value}";
+                    var tfDetail = $"{tf.Scope}{(tf.IsCompileTime ? ", Compile-time" : ", Runtime")}";
+                    AddPropertyRow(tfLabel, tfDetail);
+                }
+            }
+
+            // === Indexed Views ===
+            if (s.IndexedViews.Count > 0)
+            {
+                AddPropertySection("Indexed Views");
+                foreach (var iv in s.IndexedViews)
+                    AddPropertyRow("View", iv, isCode: true);
+            }
+
+            // === Plan-Level Warnings ===
+            if (s.PlanWarnings.Count > 0)
+            {
+                AddPropertySection("Plan Warnings");
+                foreach (var w in s.PlanWarnings)
+                {
+                    var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                        : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                    var warnPanel = new StackPanel { Margin = new Thickness(10, 2, 10, 2) };
+                    warnPanel.Children.Add(new TextBlock
+                    {
+                        Text = $"\u26A0 {w.WarningType}",
+                        FontWeight = FontWeights.SemiBold,
+                        FontSize = 11,
+                        Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(warnColor))
+                    });
+                    warnPanel.Children.Add(new TextBlock
+                    {
+                        Text = w.Message,
+                        FontSize = 11,
+                        Foreground = TooltipFgBrush,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Thickness(16, 0, 0, 0)
+                    });
+                    (_currentPropertySection ?? PropertiesContent).Children.Add(warnPanel);
+                }
+            }
+
+            // === Missing Indexes ===
+            if (s.MissingIndexes.Count > 0)
+            {
+                AddPropertySection("Missing Indexes");
+                foreach (var mi in s.MissingIndexes)
+                {
+                    AddPropertyRow($"{mi.Schema}.{mi.Table}", $"Impact: {mi.Impact:F1}%");
+                    if (!string.IsNullOrEmpty(mi.CreateStatement))
+                        AddPropertyRow("CREATE INDEX", mi.CreateStatement, isCode: true);
+                }
+            }
+        }
+
+        // === Warnings ===
+        if (node.HasWarnings)
+        {
+            AddPropertySection("Warnings");
+            foreach (var w in node.Warnings)
+            {
+                var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                    : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                var warnPanel = new StackPanel { Margin = new Thickness(10, 2, 10, 2) };
+                warnPanel.Children.Add(new TextBlock
+                {
+                    Text = $"\u26A0 {w.WarningType}",
+                    FontWeight = FontWeights.SemiBold,
+                    FontSize = 11,
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(warnColor))
+                });
+                warnPanel.Children.Add(new TextBlock
+                {
+                    Text = w.Message,
+                    FontSize = 11,
+                    Foreground = TooltipFgBrush,
+                    TextWrapping = TextWrapping.Wrap,
+                    Margin = new Thickness(16, 0, 0, 0)
+                });
+                PropertiesContent.Children.Add(warnPanel);
+            }
+        }
+
+        // Show the panel
+        PropertiesColumn.Width = new GridLength(320);
+        PropertiesSplitter.Visibility = Visibility.Visible;
+        PropertiesPanel.Visibility = Visibility.Visible;
+    }
+
+    private void AddPropertySection(string title)
+    {
+        var contentPanel = new StackPanel();
+        var expander = new Expander
+        {
+            IsExpanded = true,
+            Header = new TextBlock
+            {
+                Text = title,
+                FontWeight = FontWeights.SemiBold,
+                FontSize = 11,
+                Foreground = SectionHeaderBrush
+            },
+            Content = contentPanel,
+            Margin = new Thickness(0, 2, 0, 0),
+            Padding = new Thickness(0),
+            Foreground = SectionHeaderBrush,
+            Background = new SolidColorBrush(Color.FromArgb(0x18, 0x4F, 0xA3, 0xFF)),
+            BorderBrush = PropSeparatorBrush,
+            BorderThickness = new Thickness(0, 0, 0, 1)
+        };
+        PropertiesContent.Children.Add(expander);
+        _currentPropertySection = contentPanel;
+    }
+
+    private void AddPropertyRow(string label, string value, bool isCode = false)
+    {
+        var grid = new Grid { Margin = new Thickness(10, 3, 10, 3) };
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(120) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+        var labelBlock = new TextBlock
+        {
+            Text = label,
+            FontSize = 11,
+            Foreground = MutedBrush,
+            VerticalAlignment = VerticalAlignment.Top
+        };
+        Grid.SetColumn(labelBlock, 0);
+        grid.Children.Add(labelBlock);
+
+        var valueBox = new TextBox
+        {
+            Text = value,
+            FontSize = 11,
+            Foreground = TooltipFgBrush,
+            TextWrapping = TextWrapping.Wrap,
+            IsReadOnly = true,
+            BorderThickness = new Thickness(0),
+            Background = Brushes.Transparent,
+            Padding = new Thickness(0),
+            VerticalAlignment = VerticalAlignment.Top
+        };
+        if (isCode) valueBox.FontFamily = new FontFamily("Consolas");
+        Grid.SetColumn(valueBox, 1);
+        grid.Children.Add(valueBox);
+
+        var target = _currentPropertySection ?? PropertiesContent;
+        target.Children.Add(grid);
+    }
+
+    private void CloseProperties_Click(object sender, RoutedEventArgs e)
+    {
+        ClosePropertiesPanel();
+    }
+
+    private void ClosePropertiesPanel()
+    {
+        PropertiesPanel.Visibility = Visibility.Collapsed;
+        PropertiesSplitter.Visibility = Visibility.Collapsed;
+        PropertiesColumn.Width = new GridLength(0);
+
+        // Deselect node
+        if (_selectedNodeBorder != null)
+        {
+            _selectedNodeBorder.BorderBrush = _selectedNodeOriginalBorder;
+            _selectedNodeBorder.BorderThickness = _selectedNodeOriginalThickness;
+            _selectedNodeBorder = null;
+        }
+    }
+
+    #endregion
+
+    #region Tooltips
+
+    private ToolTip BuildNodeTooltip(PlanNode node)
+    {
+        var tip = new ToolTip
+        {
+            Background = TooltipBgBrush,
+            BorderBrush = TooltipBorderBrush,
+            Foreground = TooltipFgBrush,
+            Padding = new Thickness(12),
+            MaxWidth = 500
+        };
+
+        var stack = new StackPanel();
+
+        // Header
+        var headerText = node.PhysicalOp;
+        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp))
+            headerText += $" ({node.LogicalOp})";
+        stack.Children.Add(new TextBlock
+        {
+            Text = headerText,
+            FontWeight = FontWeights.Bold,
+            FontSize = 13,
+            Margin = new Thickness(0, 0, 0, 8)
+        });
+
+        // Cost
+        AddTooltipSection(stack, "Costs");
+        AddTooltipRow(stack, "Cost", $"{node.CostPercent}% of statement ({node.EstimatedOperatorCost:F6})");
+        AddTooltipRow(stack, "Subtree Cost", $"{node.EstimatedTotalSubtreeCost:F6}");
+
+        // Rows
+        AddTooltipSection(stack, "Rows");
+        AddTooltipRow(stack, "Estimated Rows", $"{node.EstimateRows:N1}");
+        if (node.HasActualStats)
+        {
+            AddTooltipRow(stack, "Actual Rows", $"{node.ActualRows:N0}");
+            if (node.ActualRowsRead > 0)
+                AddTooltipRow(stack, "Actual Rows Read", $"{node.ActualRowsRead:N0}");
+            AddTooltipRow(stack, "Actual Executions", $"{node.ActualExecutions:N0}");
+        }
+
+        // I/O and CPU estimates
+        if (node.EstimateIO > 0 || node.EstimateCPU > 0 || node.EstimatedRowSize > 0)
+        {
+            AddTooltipSection(stack, "Estimates");
+            if (node.EstimateIO > 0) AddTooltipRow(stack, "I/O Cost", $"{node.EstimateIO:F6}");
+            if (node.EstimateCPU > 0) AddTooltipRow(stack, "CPU Cost", $"{node.EstimateCPU:F6}");
+            if (node.EstimatedRowSize > 0) AddTooltipRow(stack, "Avg Row Size", $"{node.EstimatedRowSize} B");
+        }
+
+        // Actual I/O
+        if (node.HasActualStats && (node.ActualLogicalReads > 0 || node.ActualPhysicalReads > 0))
+        {
+            AddTooltipSection(stack, "Actual I/O");
+            AddTooltipRow(stack, "Logical Reads", $"{node.ActualLogicalReads:N0}");
+            if (node.ActualPhysicalReads > 0)
+                AddTooltipRow(stack, "Physical Reads", $"{node.ActualPhysicalReads:N0}");
+            if (node.ActualScans > 0)
+                AddTooltipRow(stack, "Scans", $"{node.ActualScans:N0}");
+            if (node.ActualReadAheads > 0)
+                AddTooltipRow(stack, "Read-Aheads", $"{node.ActualReadAheads:N0}");
+        }
+
+        // Actual timing
+        if (node.HasActualStats && (node.ActualElapsedMs > 0 || node.ActualCPUMs > 0))
+        {
+            AddTooltipSection(stack, "Timing");
+            if (node.ActualElapsedMs > 0)
+                AddTooltipRow(stack, "Elapsed Time", $"{node.ActualElapsedMs:N0} ms");
+            if (node.ActualCPUMs > 0)
+                AddTooltipRow(stack, "CPU Time", $"{node.ActualCPUMs:N0} ms");
+        }
+
+        // Parallelism
+        if (node.Parallel || !string.IsNullOrEmpty(node.ExecutionMode) || !string.IsNullOrEmpty(node.PartitioningType))
+        {
+            AddTooltipSection(stack, "Parallelism");
+            if (node.Parallel) AddTooltipRow(stack, "Parallel", "Yes");
+            if (!string.IsNullOrEmpty(node.ExecutionMode))
+                AddTooltipRow(stack, "Execution Mode", node.ExecutionMode);
+            if (!string.IsNullOrEmpty(node.ActualExecutionMode) && node.ActualExecutionMode != node.ExecutionMode)
+                AddTooltipRow(stack, "Actual Exec Mode", node.ActualExecutionMode);
+            if (!string.IsNullOrEmpty(node.PartitioningType))
+                AddTooltipRow(stack, "Partitioning", node.PartitioningType);
+        }
+
+        // Object — show full qualified name
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            AddTooltipSection(stack, "Object");
+            AddTooltipRow(stack, "Name", node.FullObjectName, isCode: true);
+            if (node.Ordered) AddTooltipRow(stack, "Ordered", "True");
+            if (!string.IsNullOrEmpty(node.ScanDirection))
+                AddTooltipRow(stack, "Scan Direction", node.ScanDirection);
+        }
+        else if (!string.IsNullOrEmpty(node.ObjectName))
+        {
+            AddTooltipSection(stack, "Object");
+            AddTooltipRow(stack, "Name", node.ObjectName, isCode: true);
+            if (node.Ordered) AddTooltipRow(stack, "Ordered", "True");
+            if (!string.IsNullOrEmpty(node.ScanDirection))
+                AddTooltipRow(stack, "Scan Direction", node.ScanDirection);
+        }
+
+        // Operator details (key items only in tooltip)
+        var hasTooltipDetails = !string.IsNullOrEmpty(node.OrderBy)
+            || !string.IsNullOrEmpty(node.TopExpression)
+            || !string.IsNullOrEmpty(node.GroupBy)
+            || !string.IsNullOrEmpty(node.OuterReferences);
+        if (hasTooltipDetails)
+        {
+            AddTooltipSection(stack, "Details");
+            if (!string.IsNullOrEmpty(node.OrderBy))
+                AddTooltipRow(stack, "Order By", node.OrderBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.TopExpression))
+                AddTooltipRow(stack, "Top", node.IsPercent ? $"{node.TopExpression} PERCENT" : node.TopExpression);
+            if (!string.IsNullOrEmpty(node.GroupBy))
+                AddTooltipRow(stack, "Group By", node.GroupBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.OuterReferences))
+                AddTooltipRow(stack, "Outer References", node.OuterReferences, isCode: true);
+        }
+
+        // Predicates
+        if (!string.IsNullOrEmpty(node.SeekPredicates) || !string.IsNullOrEmpty(node.Predicate))
+        {
+            AddTooltipSection(stack, "Predicates");
+            if (!string.IsNullOrEmpty(node.SeekPredicates))
+                AddTooltipRow(stack, "Seek", node.SeekPredicates, isCode: true);
+            if (!string.IsNullOrEmpty(node.Predicate))
+                AddTooltipRow(stack, "Residual", node.Predicate, isCode: true);
+        }
+
+        // Output columns
+        if (!string.IsNullOrEmpty(node.OutputColumns))
+        {
+            AddTooltipSection(stack, "Output");
+            AddTooltipRow(stack, "Columns", node.OutputColumns, isCode: true);
+        }
+
+        // Warnings
+        if (node.HasWarnings)
+        {
+            stack.Children.Add(new Separator { Margin = new Thickness(0, 6, 0, 6) });
+            foreach (var w in node.Warnings)
+            {
+                var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                    : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                stack.Children.Add(new TextBlock
+                {
+                    Text = $"\u26A0 {w.WarningType}: {w.Message}",
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(warnColor)),
+                    FontSize = 11,
+                    TextWrapping = TextWrapping.Wrap,
+                    Margin = new Thickness(0, 2, 0, 0)
+                });
+            }
+        }
+
+        // Footer hint
+        stack.Children.Add(new TextBlock
+        {
+            Text = "Click to view full properties",
+            FontSize = 10,
+            FontStyle = FontStyles.Italic,
+            Foreground = MutedBrush,
+            Margin = new Thickness(0, 8, 0, 0)
+        });
+
+        tip.Content = stack;
+        return tip;
+    }
+
+    private static void AddTooltipSection(StackPanel parent, string title)
+    {
+        parent.Children.Add(new TextBlock
+        {
+            Text = title,
+            FontSize = 10,
+            FontWeight = FontWeights.SemiBold,
+            Foreground = SectionHeaderBrush,
+            Margin = new Thickness(0, 6, 0, 2)
+        });
+    }
+
+    private static void AddTooltipRow(StackPanel parent, string label, string value, bool isCode = false)
+    {
+        var row = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 1, 0, 1) };
+        row.Children.Add(new TextBlock
+        {
+            Text = $"{label}: ",
+            Foreground = MutedBrush,
+            FontSize = 11,
+            MinWidth = 120
+        });
+        var valueBlock = new TextBlock
+        {
+            Text = value,
+            FontSize = 11,
+            TextWrapping = TextWrapping.Wrap,
+            MaxWidth = 350
+        };
+        if (isCode) valueBlock.FontFamily = new FontFamily("Consolas");
+        row.Children.Add(valueBlock);
+        parent.Children.Add(row);
+    }
+
+    #endregion
+
+    #region Banners
+
+    private void ShowMissingIndexes(List<MissingIndex> indexes)
+    {
+        if (indexes.Count > 0)
+        {
+            MissingIndexList.ItemsSource = indexes;
+            MissingIndexBanner.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            MissingIndexBanner.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private void ShowWarnings(PlanNode root)
+    {
+        var allWarnings = new List<PlanWarning>();
+        CollectWarnings(root, allWarnings);
+
+        if (allWarnings.Count > 0)
+        {
+            var criticalCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Critical);
+            var warningCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Warning);
+            var parts = new List<string>();
+            if (criticalCount > 0) parts.Add($"{criticalCount} critical");
+            if (warningCount > 0) parts.Add($"{warningCount} warning(s)");
+            WarningsSummaryText.Text = $"Plan has {string.Join(", ", parts)} — hover over nodes with \u26A0 for details";
+            WarningsBanner.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            WarningsBanner.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
+    {
+        warnings.AddRange(node.Warnings);
+        foreach (var child in node.Children)
+            CollectWarnings(child, warnings);
+    }
+
+    #endregion
+
+    #region Zoom
+
+    private void ZoomIn_Click(object sender, RoutedEventArgs e) => SetZoom(_zoomLevel + ZoomStep);
+    private void ZoomOut_Click(object sender, RoutedEventArgs e) => SetZoom(_zoomLevel - ZoomStep);
+
+    private void ZoomFit_Click(object sender, RoutedEventArgs e)
+    {
+        if (PlanCanvas.Width <= 0 || PlanCanvas.Height <= 0) return;
+
+        var viewWidth = PlanScrollViewer.ActualWidth;
+        var viewHeight = PlanScrollViewer.ActualHeight;
+        if (viewWidth <= 0 || viewHeight <= 0) return;
+
+        var fitZoom = Math.Min(viewWidth / PlanCanvas.Width, viewHeight / PlanCanvas.Height);
+        SetZoom(Math.Min(fitZoom, 1.0));
+    }
+
+    private void SetZoom(double level)
+    {
+        _zoomLevel = Math.Max(MinZoom, Math.Min(MaxZoom, level));
+        ZoomTransform.ScaleX = _zoomLevel;
+        ZoomTransform.ScaleY = _zoomLevel;
+        ZoomLevelText.Text = $"{(int)(_zoomLevel * 100)}%";
+    }
+
+    private void PlanScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+    {
+        if (Keyboard.Modifiers == ModifierKeys.Control)
+        {
+            e.Handled = true;
+            SetZoom(_zoomLevel + (e.Delta > 0 ? ZoomStep : -ZoomStep));
+        }
+    }
+
+    #endregion
+
+    #region Save & Statement Selection
+
+    private void SavePlan_Click(object sender, RoutedEventArgs e)
+    {
+        if (_currentPlan == null || string.IsNullOrEmpty(_currentPlan.RawXml)) return;
+
+        var dialog = new SaveFileDialog
+        {
+            Filter = "SQL Plan Files (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+            DefaultExt = ".sqlplan",
+            FileName = $"plan_{DateTime.Now:yyyyMMdd_HHmmss}.sqlplan"
+        };
+
+        if (dialog.ShowDialog() == true)
+        {
+            File.WriteAllText(dialog.FileName, _currentPlan.RawXml);
+        }
+    }
+
+    private void StatementSelector_Changed(object sender, SelectionChangedEventArgs e)
+    {
+        if (StatementSelector.SelectedItem is ComboBoxItem item && item.Tag is int index)
+        {
+            var allStatements = _currentPlan?.Batches
+                .SelectMany(b => b.Statements)
+                .Where(s => s.RootNode != null)
+                .ToList();
+
+            if (allStatements != null && index >= 0 && index < allStatements.Count)
+                RenderStatement(allStatements[index]);
+        }
+    }
+
+    #endregion
+}
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml b/Dashboard/Controls/QueryPerformanceContent.xaml
index ca8c9dd3..b7c71c9d 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml
@@ -31,6 +31,9 @@
                 <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
                     <MenuItem.Icon><TextBlock Text="📊"/></MenuItem.Icon>
                 </MenuItem>
+                <Separator/>
+                <MenuItem Header="View Plan" Click="ViewEstimatedPlan_Click"/>
+                <MenuItem Header="Get Actual Plan" Click="GetActualPlan_Click"/>
             </ContextMenu>
 
             <Style x:Key="DefaultRowStyle" TargetType="DataGridRow">
@@ -74,7 +77,7 @@
         <TabItem Header="Active Queries">
             <Grid>
             <DataGrid x:Name="ActiveQueriesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="35" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       RowStyle="{DynamicResource DefaultRowStyle}">
                 <DataGrid.Columns>
@@ -86,7 +89,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding SessionId}" Width="60">
+                    <DataGridTextColumn Binding="{Binding SessionId}" ElementStyle="{StaticResource NumericCell}" Width="60">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SessionId" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -118,7 +121,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding BlockingSessionId}" Width="80">
+                    <DataGridTextColumn Binding="{Binding BlockingSessionId}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockingSessionId" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -126,7 +129,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding BlockedSessionCount}" Width="80">
+                    <DataGridTextColumn Binding="{Binding BlockedSessionCount}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockedSessionCount" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -134,7 +137,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Cpu}" Width="80">
+                    <DataGridTextColumn Binding="{Binding Cpu}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Cpu" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -142,7 +145,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Reads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding Reads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Reads" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -150,7 +153,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Writes, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding Writes, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Writes" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -158,7 +161,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding PhysicalReads}" Width="100">
+                    <DataGridTextColumn Binding="{Binding PhysicalReads}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PhysicalReads" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -166,7 +169,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ContextSwitches}" Width="100">
+                    <DataGridTextColumn Binding="{Binding ContextSwitches}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ContextSwitches" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -174,7 +177,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding UsedMemoryMb, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding UsedMemoryMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="UsedMemoryMb" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -182,7 +185,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TempdbCurrentMb, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding TempdbCurrentMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TempdbCurrentMb" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -190,7 +193,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TempdbAllocations, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding TempdbAllocations, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TempdbAllocations" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -198,7 +201,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TranLogWrites}" Width="100">
+                    <DataGridTextColumn Binding="{Binding TranLogWrites}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TranLogWrites" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -206,7 +209,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding OpenTranCount}" Width="80">
+                    <DataGridTextColumn Binding="{Binding OpenTranCount}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OpenTranCount" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -214,7 +217,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding PercentComplete, StringFormat='{}{0:N1}%'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding PercentComplete, StringFormat='{}{0:N1}%'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PercentComplete" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -238,7 +241,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding RequestId}" Width="70">
+                    <DataGridTextColumn Binding="{Binding RequestId}" ElementStyle="{StaticResource NumericCell}" Width="70">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RequestId" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
@@ -278,14 +281,19 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryText}" Width="400">
-                        <DataGridTextColumn.Header>
+                    <DataGridTemplateColumn Width="400">
+                        <DataGridTemplateColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="ActiveQueriesFilter_Click" Margin="0,0,4,0"/>
                                 <TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding QueryText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding QueryText}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                     <DataGridTextColumn Binding="{Binding SqlCommand}" Width="400">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
@@ -320,11 +328,241 @@
             </Grid>
         </TabItem>
 
+        <!-- Current Active Queries Sub-Tab (Live DMV Snapshot) -->
+        <TabItem Header="Current Active Queries">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,5">
+                    <Button x:Name="CurrentActiveRefreshButton" Content="Refresh"
+                            Click="CurrentActiveRefresh_Click" Padding="12,4" Margin="0,0,8,0"/>
+                    <TextBlock x:Name="CurrentActiveTimestamp" VerticalAlignment="Center"
+                               Foreground="DarkGoldenrod" FontWeight="SemiBold" FontSize="12"/>
+                </StackPanel>
+
+                <DataGrid Grid.Row="1" x:Name="CurrentActiveQueriesDataGrid"
+                          AutoGenerateColumns="False" IsReadOnly="True"
+                          GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                          ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                          RowStyle="{DynamicResource DefaultRowStyle}">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Binding="{Binding SessionId}" ElementStyle="{StaticResource NumericCell}" Width="60">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SessionId" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="SPID" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding Status}" Width="80">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Status" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding ElapsedTimeFormatted}" Width="120">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ElapsedTimeFormatted" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Elapsed" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding LoginName}" Width="110">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LoginName" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Login" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding HostName}" Width="110">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HostName" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Host" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding ProgramName}" Width="140">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ProgramName" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Program" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding CpuTimeMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CpuTimeMs" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding LogicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LogicalReads" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding Reads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Reads" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding Writes, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Writes" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding WaitType}" Width="120">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitType" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Wait Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding WaitTimeMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitTimeMs" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Wait (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding WaitResource}" Width="140">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitResource" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Wait Resource" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding BlockingSessionId}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockingSessionId" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Blocking" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding Dop}" ElementStyle="{StaticResource NumericCell}" Width="50">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Dop" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="DOP" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding ParallelWorkerCount}" ElementStyle="{StaticResource NumericCell}" Width="60">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ParallelWorkerCount" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Workers" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding GrantedQueryMemoryGb, StringFormat='{}{0:F2}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="GrantedQueryMemoryGb" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Memory (GB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding TransactionIsolationLevel}" Width="140">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TransactionIsolationLevel" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Isolation" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding OpenTransactionCount}" ElementStyle="{StaticResource NumericCell}" Width="70">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OpenTransactionCount" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Open Tran" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding PercentComplete, StringFormat='{}{0:F1}'}" ElementStyle="{StaticResource NumericCell}" Width="70">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PercentComplete" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="% Done" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTemplateColumn Width="500">
+                            <DataGridTemplateColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="CurrentActiveFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTemplateColumn.Header>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding QueryText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding QueryText}"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Header="Est Plan" Width="Auto" MinWidth="80">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Button Content="Download" Click="DownloadCurrentActiveEstPlan_Click"
+                                            IsEnabled="{Binding HasQueryPlan}"
+                                            HorizontalAlignment="Center" VerticalAlignment="Center"
+                                            Padding="8,4"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTemplateColumn Header="Live Plan" Width="Auto" MinWidth="80">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <Button Content="Download" Click="DownloadCurrentActiveLivePlan_Click"
+                                            IsEnabled="{Binding HasLiveQueryPlan}"
+                                            HorizontalAlignment="Center" VerticalAlignment="Center"
+                                            Padding="8,4"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
+                <TextBlock x:Name="CurrentActiveNoDataMessage" Style="{StaticResource EmptyStateMessage}"
+                           Text="Click Refresh to load current active queries" Grid.Row="1"/>
+                <local:LoadingOverlay x:Name="CurrentActiveLoading" Grid.Row="1"/>
+            </Grid>
+        </TabItem>
+
         <!-- Query Stats Sub-Tab -->
         <TabItem Header="Query Stats">
             <Grid>
             <DataGrid x:Name="QueryStatsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="35" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="QueryStatsDataGrid_MouseDoubleClick">
@@ -385,7 +623,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -393,7 +631,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalCpuTimeMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding TotalCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalCpuTimeMs" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -401,7 +639,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuTimeMs" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -409,7 +647,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinWorkerTime}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinWorkerTime}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinWorkerTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -417,7 +655,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxWorkerTime}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MaxWorkerTime}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxWorkerTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -425,7 +663,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat='{}{0:N2}'}" Width="120">
+                    <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="120">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeMs" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -433,7 +671,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat='{}{0:N2}'}" Width="120">
+                    <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="120">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedTimeMs" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -441,7 +679,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinElapsedTime}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MinElapsedTime}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -449,7 +687,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxElapsedTime}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MaxElapsedTime}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedTime" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -457,7 +695,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -465,7 +703,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -473,7 +711,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat='{}{0:N0}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -481,7 +719,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -489,7 +727,23 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Min Phys Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Max Phys Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -497,7 +751,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalRows, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding TotalRows, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRows" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -505,7 +759,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgRows, StringFormat='{}{0:N2}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding AvgRows, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRows" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -513,7 +767,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinRows, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MinRows, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRows" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -521,7 +775,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxRows, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MaxRows, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRows" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -529,7 +783,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                    <DataGridTextColumn Binding="{Binding MinDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -537,7 +791,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxDop}" Width="70">
+                    <DataGridTextColumn Binding="{Binding MaxDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -545,7 +799,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxGrantMb, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MaxGrantMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxGrantMb" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -553,7 +807,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -561,7 +815,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinSpills, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MinSpills, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -569,7 +823,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
@@ -577,14 +831,19 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryText}" Width="500">
-                        <DataGridTextColumn.Header>
+                    <DataGridTemplateColumn Width="500">
+                        <DataGridTemplateColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="QueryStatsFilter_Click" Margin="0,0,4,0"/>
                                 <TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding QueryText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding QueryText}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock x:Name="QueryStatsNoDataMessage" Style="{StaticResource EmptyStateMessage}"
@@ -597,7 +856,7 @@
         <TabItem Header="Procedure Stats">
             <Grid>
             <DataGrid x:Name="ProcStatsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="35" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="ProcStatsDataGrid_MouseDoubleClick">
@@ -666,7 +925,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -674,7 +933,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalCpuTimeMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding TotalCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalCpuTimeMs" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -682,7 +941,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuTimeMs" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -690,7 +949,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinWorkerTime}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinWorkerTime}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinWorkerTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -698,7 +957,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxWorkerTime}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MaxWorkerTime}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxWorkerTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -706,7 +965,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat='{}{0:N2}'}" Width="120">
+                    <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="120">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeMs" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -714,7 +973,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat='{}{0:N2}'}" Width="120">
+                    <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="120">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedTimeMs" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -722,7 +981,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinElapsedTime}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MinElapsedTime}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -730,7 +989,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxElapsedTime}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MaxElapsedTime}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedTime" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -738,7 +997,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -746,7 +1005,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -754,7 +1013,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -762,7 +1021,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -770,7 +1029,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat='{}{0:N0}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -778,7 +1037,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -786,7 +1045,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -794,7 +1053,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -802,7 +1061,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -810,7 +1069,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalWrites" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -818,7 +1077,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalWrites" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -826,7 +1085,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat='{}{0:N0}'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -834,7 +1093,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinSpills, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MinSpills, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -842,7 +1101,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="ProcStatsFilter_Click" Margin="0,0,4,0"/>
@@ -860,7 +1119,7 @@
         <TabItem Header="Query Store">
             <Grid>
             <DataGrid x:Name="QueryStoreDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="35" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
                       RowStyle="{DynamicResource DefaultRowStyle}"
                       MouseDoubleClick="QueryStoreDataGrid_MouseDoubleClick">
@@ -881,7 +1140,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryId}" Width="80">
+                    <DataGridTextColumn Binding="{Binding QueryId}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryId" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -889,7 +1148,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding PlanCount, StringFormat='{}{0:N0}'}" Width="80">
+                    <DataGridTextColumn Binding="{Binding PlanCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanCount" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -929,7 +1188,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -937,7 +1196,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -945,7 +1204,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinDurationMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MinDurationMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDurationMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -953,7 +1212,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxDurationMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MaxDurationMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDurationMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -961,7 +1220,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuTimeMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -969,7 +1228,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinCpuTimeMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinCpuTimeMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -977,7 +1236,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxCpuTimeMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MaxCpuTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxCpuTimeMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -985,7 +1244,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgLogicalIoReads}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgLogicalIoReads}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -993,7 +1252,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinLogicalIoReads}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MinLogicalIoReads}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1001,7 +1260,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxLogicalIoReads}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MaxLogicalIoReads}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1009,7 +1268,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgLogicalIoWrites}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgLogicalIoWrites}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalIoWrites" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1017,7 +1276,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinLogicalIoWrites}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MinLogicalIoWrites}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalIoWrites" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1025,7 +1284,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxLogicalIoWrites}" Width="90">
+                    <DataGridTextColumn Binding="{Binding MaxLogicalIoWrites}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalIoWrites" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1033,7 +1292,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgPhysicalIoReads}" Width="110">
+                    <DataGridTextColumn Binding="{Binding AvgPhysicalIoReads}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1041,7 +1300,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinPhysicalIoReads}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinPhysicalIoReads}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1049,7 +1308,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxPhysicalIoReads}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MaxPhysicalIoReads}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1057,7 +1316,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgRowcount}" Width="90">
+                    <DataGridTextColumn Binding="{Binding AvgRowcount}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRowcount" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1065,7 +1324,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinRowcount}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MinRowcount}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRowcount" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1073,7 +1332,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxRowcount}" Width="80">
+                    <DataGridTextColumn Binding="{Binding MaxRowcount}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRowcount" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1081,7 +1340,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                    <DataGridTextColumn Binding="{Binding MinDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1089,7 +1348,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxDop}" Width="70">
+                    <DataGridTextColumn Binding="{Binding MaxDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1097,7 +1356,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgMemoryMb, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgMemoryMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgMemoryMb" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1105,7 +1364,15 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxMemoryMb, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinMemoryMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinMemoryMb" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Min Mem (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MaxMemoryMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxMemoryMb" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1113,7 +1380,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgTempdbMb, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgTempdbMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgTempdbMb" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1121,7 +1388,15 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxTempdbMb, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding MinTempdbMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinTempdbMb" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Min TempDB (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MaxTempdbMb, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxTempdbMb" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1145,7 +1420,7 @@
                             </StackPanel>
                         </DataGridCheckBoxColumn.Header>
                     </DataGridCheckBoxColumn>
-                    <DataGridTextColumn Binding="{Binding ForceFailureCount}" Width="90">
+                    <DataGridTextColumn Binding="{Binding ForceFailureCount}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ForceFailureCount" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1161,7 +1436,63 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CompatibilityLevel}" Width="80">
+                    <DataGridTextColumn Binding="{Binding PlanForcingType}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanForcingType" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Forcing Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MinClrTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinClrTimeMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Min CLR (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MaxClrTimeMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxClrTimeMs" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Max CLR (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MinNumPhysicalIoReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinNumPhysicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Min Phys IO Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MaxNumPhysicalIoReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxNumPhysicalIoReads" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Max Phys IO Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MinLogBytesUsed, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogBytesUsed" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Min Log Bytes" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding MaxLogBytesUsed, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogBytesUsed" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Max Log Bytes" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding CompatibilityLevel}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CompatibilityLevel" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
@@ -1169,14 +1500,19 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryText}" Width="500">
-                        <DataGridTextColumn.Header>
+                    <DataGridTemplateColumn Width="500">
+                        <DataGridTemplateColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="QueryStoreFilter_Click" Margin="0,0,4,0"/>
                                 <TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding QueryText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding QueryText}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock x:Name="QueryStoreNoDataMessage" Style="{StaticResource NoDataMessage}"/>
@@ -1187,122 +1523,168 @@
         <TabItem Header="Query Store Regressions">
             <Grid>
             <DataGrid x:Name="QueryStoreRegressionsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="35" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
-                      RowStyle="{DynamicResource DefaultRowStyle}">
+                      RowStyle="{DynamicResource DefaultRowStyle}"
+                      MouseDoubleClick="QueryStoreRegressionsDataGrid_MouseDoubleClick">
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Last Execution" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="140" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsFilterTextBox_TextChanged" Tag="LastExecutionTime"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Last Execution" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
                     <DataGridTextColumn Binding="{Binding Severity}" Width="80">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Severity" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="70" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsFilterTextBox_TextChanged" Tag="Severity"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Severity" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Severity" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Database" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="110" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsFilterTextBox_TextChanged" Tag="DatabaseName"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding QueryId}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryId" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Query ID" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding AdditionalDurationMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AdditionalDurationMs" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Total Impact (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryId}" Width="80">
+                    <DataGridTextColumn Binding="{Binding BaselineExecCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Query ID" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="70" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="QueryId"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BaselineExecCount" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Base Execs" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding DurationRegressionPercent, StringFormat='{}{0:N2}%'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding RecentExecCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Duration Δ%" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="100" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="DurationRegressionPercent"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RecentExecCount" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Recent Execs" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding BaselineDurationMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding BaselinePlanCount}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Base Dur (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="BaselineDurationMs"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BaselinePlanCount" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Base Plans" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding RecentDurationMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding RecentPlanCount}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Recent Dur (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="100" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="RecentDurationMs"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RecentPlanCount" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Recent Plans" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CpuRegressionPercent, StringFormat='{}{0:N2}%'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding DurationRegressionPercent, StringFormat='{}{0:N2}%'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="CPU Δ%" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="CpuRegressionPercent"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DurationRegressionPercent" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Duration Δ%" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding BaselineCpuMs, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding BaselineDurationMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Base CPU (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="BaselineCpuMs"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BaselineDurationMs" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Base Dur (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding RecentCpuMs, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding RecentDurationMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Recent CPU (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="100" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="RecentCpuMs"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RecentDurationMs" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Recent Dur (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding IoRegressionPercent, StringFormat='{}{0:N2}%'}" Width="90">
+                    <DataGridTextColumn Binding="{Binding CpuRegressionPercent, StringFormat='{}{0:N2}%'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="I/O Δ%" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="IoRegressionPercent"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CpuRegressionPercent" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="CPU Δ%" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding BaselineReads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding BaselineCpuMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Base Reads (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="BaselineReads"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BaselineCpuMs" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Base CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding RecentReads, StringFormat='{}{0:N0}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding RecentCpuMs, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Recent Reads (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsNumericFilterTextBox_TextChanged" Tag="RecentReads"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RecentCpuMs" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Recent CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding IoRegressionPercent, StringFormat='{}{0:N2}%'}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IoRegressionPercent" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="I/O Δ%" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding BaselineReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BaselineReads" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Base Reads (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryTextSample}" Width="*" MinWidth="300">
+                    <DataGridTextColumn Binding="{Binding RecentReads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Query Text" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="290" Height="22" FontSize="11" Style="{StaticResource FilterTextBoxStyle}" TextChanged="QueryStoreRegressionsFilterTextBox_TextChanged" Tag="QueryTextSample"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RecentReads" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Recent Reads (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
+                    <DataGridTemplateColumn Width="*" MinWidth="300">
+                        <DataGridTemplateColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryTextSample" Click="QsRegressionsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding QueryTextSample}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding QueryTextSample}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock x:Name="QueryStoreRegressionsNoDataMessage" Style="{StaticResource NoDataMessage}"/>
@@ -1313,82 +1695,109 @@
         <TabItem Header="Query Trace Patterns">
             <Grid>
             <DataGrid x:Name="LongRunningQueryPatternsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="35" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
-                      RowStyle="{DynamicResource DefaultRowStyle}">
+                      RowStyle="{DynamicResource DefaultRowStyle}"
+                      MouseDoubleClick="LongRunningQueryPatternsDataGrid_MouseDoubleClick">
                 <DataGrid.Columns>
                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Database" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="110" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsFilterTextBox_TextChanged" Tag="DatabaseName"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Executions}" Width="100">
+                    <DataGridTextColumn Binding="{Binding Executions}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Executions" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsNumericFilterTextBox_TextChanged" Tag="Executions"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Executions" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Executions" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgDurationSec, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding AvgDurationSec, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Avg Duration (sec)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="100" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsNumericFilterTextBox_TextChanged" Tag="AvgDurationSec"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationSec" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Avg Duration (sec)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding MaxDurationSec, StringFormat='{}{0:N2}'}" Width="110">
+                    <DataGridTextColumn Binding="{Binding MaxDurationSec, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="110">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Max Duration (sec)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="100" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsNumericFilterTextBox_TextChanged" Tag="MaxDurationSec"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDurationSec" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Max Duration (sec)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgCpuSec, StringFormat='{}{0:N2}'}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgCpuSec, StringFormat='{}{0:N2}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Avg CPU (sec)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsNumericFilterTextBox_TextChanged" Tag="AvgCpuSec"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuSec" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Avg CPU (sec)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding AvgReads}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgReads}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Avg Reads (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsNumericFilterTextBox_TextChanged" Tag="AvgReads"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgReads" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Avg Reads (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ConcernLevel}" Width="100">
+                    <DataGridTextColumn Binding="{Binding AvgWrites}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Concern" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsFilterTextBox_TextChanged" Tag="ConcernLevel"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgWrites" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Avg Writes (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LastExecution, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn Binding="{Binding ConcernLevel}" Width="100">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Last Execution" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsFilterTextBox_TextChanged" Tag="LastExecution"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ConcernLevel" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Concern" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding QueryPattern}" Width="*" MinWidth="300">
+                    <DataGridTemplateColumn Width="250">
+                        <DataGridTemplateColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Recommendation" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Recommendation" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Recommendation}" TextTrimming="CharacterEllipsis" Margin="5,2" ToolTip="{Binding Recommendation}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTextColumn Binding="{Binding LastExecution, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
                         <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Query Pattern" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="290" Height="22" FontSize="11" TextChanged="LongRunningQueryPatternsFilterTextBox_TextChanged" Tag="QueryPattern"/>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecution" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Last Execution" FontWeight="Bold" VerticalAlignment="Center"/>
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
+                    <DataGridTemplateColumn Width="*" MinWidth="300">
+                        <DataGridTemplateColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryPattern" Click="LrqPatternsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Query Pattern" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTemplateColumn.Header>
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding QueryPattern}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding SampleQueryText}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <TextBlock x:Name="LongRunningQueryPatternsNoDataMessage" Style="{StaticResource NoDataMessage}"/>
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml.cs b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
index 59d59287..5e610547 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml.cs
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
@@ -8,10 +8,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -36,6 +38,20 @@ public partial class QueryPerformanceContent : UserControl
         private DatabaseService? _databaseService;
         private Action<string>? _statusCallback;
 
+        /// <summary>Raised when user wants to view a plan in the Plan Viewer tab. Args: (planXml, label, queryText)</summary>
+        public event Action<string, string, string?>? ViewPlanRequested;
+
+        /// <summary>Raised when actual plan execution starts. Arg: label for the plan tab.</summary>
+        public event Action<string>? ActualPlanStarted;
+
+        /// <summary>Raised when actual plan execution finishes (success or failure).</summary>
+        public event Action? ActualPlanFinished;
+
+        private CancellationTokenSource? _actualPlanCts;
+
+        /// <summary>Cancels the in-flight actual plan execution, if any.</summary>
+        public void CancelActualPlan() => _actualPlanCts?.Cancel();
+
         private Popup? _filterPopup;
         private ColumnFilterPopup? _filterPopupContent;
 
@@ -43,6 +59,10 @@ public partial class QueryPerformanceContent : UserControl
         private Dictionary<string, Models.ColumnFilterState> _activeQueriesFilters = new();
         private List<QuerySnapshotItem>? _activeQueriesUnfilteredData;
 
+        // Current Active Queries filter state
+        private Dictionary<string, Models.ColumnFilterState> _currentActiveFilters = new();
+        private List<LiveQueryItem>? _currentActiveUnfilteredData;
+
         // Query Stats filter state
         private Dictionary<string, Models.ColumnFilterState> _queryStatsFilters = new();
         private List<QueryStatsItem>? _queryStatsUnfilteredData;
@@ -55,6 +75,14 @@ public partial class QueryPerformanceContent : UserControl
         private Dictionary<string, Models.ColumnFilterState> _queryStoreFilters = new();
         private List<QueryStoreItem>? _queryStoreUnfilteredData;
 
+        // Query Store Regressions filter state
+        private Dictionary<string, Models.ColumnFilterState> _qsRegressionsFilters = new();
+        private List<QueryStoreRegressionItem>? _qsRegressionsUnfilteredData;
+
+        // Query Trace Patterns filter state
+        private Dictionary<string, Models.ColumnFilterState> _lrqPatternsFilters = new();
+        private List<LongRunningQueryPatternItem>? _lrqPatternsUnfilteredData;
+
         // Active Queries state
         private int _activeQueriesHoursBack = 1;
         private DateTime? _activeQueriesFromDate;
@@ -125,13 +153,22 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
                 _filterPopupContent.FilterCleared -= ProcStatsFilterPopup_FilterCleared;
                 _filterPopupContent.FilterApplied -= QueryStoreFilterPopup_FilterApplied;
                 _filterPopupContent.FilterCleared -= QueryStoreFilterPopup_FilterCleared;
+                _filterPopupContent.FilterApplied -= CurrentActiveFilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared -= CurrentActiveFilterPopup_FilterCleared;
+                _filterPopupContent.FilterApplied -= QsRegressionsFilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared -= QsRegressionsFilterPopup_FilterCleared;
+                _filterPopupContent.FilterApplied -= LrqPatternsFilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared -= LrqPatternsFilterPopup_FilterCleared;
             }
 
             /* Clear large data collections to free memory */
+            _currentActiveUnfilteredData = null;
             _activeQueriesUnfilteredData = null;
             _queryStatsUnfilteredData = null;
             _procStatsUnfilteredData = null;
             _queryStoreUnfilteredData = null;
+            _qsRegressionsUnfilteredData = null;
+            _lrqPatternsUnfilteredData = null;
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -148,6 +185,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
             // Apply minimum column widths based on header text to all DataGrids
             TabHelpers.AutoSizeColumnMinWidths(ActiveQueriesDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(CurrentActiveQueriesDataGrid);
             TabHelpers.AutoSizeColumnMinWidths(QueryStatsDataGrid);
             TabHelpers.AutoSizeColumnMinWidths(ProcStatsDataGrid);
             TabHelpers.AutoSizeColumnMinWidths(QueryStoreDataGrid);
@@ -156,6 +194,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
             // Freeze first columns for easier horizontal scrolling
             TabHelpers.FreezeColumns(ActiveQueriesDataGrid, 2);
+            TabHelpers.FreezeColumns(CurrentActiveQueriesDataGrid, 2);
             TabHelpers.FreezeColumns(QueryStatsDataGrid, 2);
             TabHelpers.FreezeColumns(ProcStatsDataGrid, 2);
             TabHelpers.FreezeColumns(QueryStoreDataGrid, 2);
@@ -251,14 +290,17 @@ await Task.WhenAll(
                 var queryStats = await queryStatsTask;
                 QueryStatsDataGrid.ItemsSource = queryStats;
                 QueryStatsNoDataMessage.Visibility = queryStats.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                SetInitialSort(QueryStatsDataGrid, "AvgCpuTimeMs", ListSortDirection.Descending);
 
                 var procStats = await procStatsTask;
                 ProcStatsDataGrid.ItemsSource = procStats;
                 ProcStatsNoDataMessage.Visibility = procStats.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                SetInitialSort(ProcStatsDataGrid, "AvgCpuTimeMs", ListSortDirection.Descending);
 
                 var queryStore = await queryStoreTask;
                 QueryStoreDataGrid.ItemsSource = queryStore;
                 QueryStoreNoDataMessage.Visibility = queryStore.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                SetInitialSort(QueryStoreDataGrid, "AvgCpuTimeMs", ListSortDirection.Descending);
 
                 // Populate charts from time-series data
                 LoadDurationChart(QueryPerfTrendsQueryChart, await queryDurationTrendsTask, _perfTrendsHoursBack, _perfTrendsFromDate, _perfTrendsToDate, "Duration (ms/sec)", TabHelpers.ChartColors[0], _queryDurationHover);
@@ -281,6 +323,20 @@ private void SetStatus(string message)
             _statusCallback?.Invoke(message);
         }
 
+        private static void SetInitialSort(DataGrid grid, string bindingPath, ListSortDirection direction)
+        {
+            foreach (var column in grid.Columns)
+            {
+                if (column is DataGridBoundColumn bc &&
+                    bc.Binding is Binding b &&
+                    b.Path.Path == bindingPath)
+                {
+                    column.SortDirection = direction;
+                    return;
+                }
+            }
+        }
+
         private void SetupChartSaveMenus()
         {
             TabHelpers.SetupChartContextMenu(QueryPerfTrendsQueryChart, "Query_Durations", "report.query_stats_summary");
@@ -360,6 +416,10 @@ private void RewireFilterPopupEvents(
             _filterPopupContent.FilterCleared -= ProcStatsFilterPopup_FilterCleared;
             _filterPopupContent.FilterApplied -= QueryStoreFilterPopup_FilterApplied;
             _filterPopupContent.FilterCleared -= QueryStoreFilterPopup_FilterCleared;
+            _filterPopupContent.FilterApplied -= QsRegressionsFilterPopup_FilterApplied;
+            _filterPopupContent.FilterCleared -= QsRegressionsFilterPopup_FilterCleared;
+            _filterPopupContent.FilterApplied -= LrqPatternsFilterPopup_FilterApplied;
+            _filterPopupContent.FilterCleared -= LrqPatternsFilterPopup_FilterCleared;
 
             // Add the new handlers
             _filterPopupContent.FilterApplied += filterAppliedHandler;
@@ -525,6 +585,379 @@ private async void DownloadActiveQueryPlan_Click(object sender, RoutedEventArgs
 
         #endregion
 
+        #region Current Active Queries
+
+        private async void CurrentActiveRefresh_Click(object sender, RoutedEventArgs e)
+        {
+            await RefreshCurrentActiveQueriesAsync();
+        }
+
+        private async Task RefreshCurrentActiveQueriesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                CurrentActiveRefreshButton.IsEnabled = false;
+
+                if (CurrentActiveQueriesDataGrid.ItemsSource == null)
+                {
+                    CurrentActiveLoading.IsLoading = true;
+                    CurrentActiveNoDataMessage.Visibility = Visibility.Collapsed;
+                }
+                SetStatus("Loading current active queries...");
+
+                var data = await _databaseService.GetCurrentActiveQueriesAsync();
+
+                _currentActiveUnfilteredData = data;
+                CurrentActiveQueriesDataGrid.ItemsSource = data;
+                CurrentActiveNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                CurrentActiveTimestamp.Text = $"Last refreshed: {DateTime.Now:HH:mm:ss} — {data.Count} queries";
+
+                if (_currentActiveFilters.Count > 0)
+                    ApplyCurrentActiveFilters();
+
+                SetStatus($"Loaded {data.Count} current active queries");
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading current active queries: {ex.Message}");
+                CurrentActiveTimestamp.Text = $"Error: {ex.Message}";
+                SetStatus("Error loading current active queries");
+            }
+            finally
+            {
+                CurrentActiveLoading.IsLoading = false;
+                CurrentActiveRefreshButton.IsEnabled = true;
+            }
+        }
+
+        private void CurrentActiveFilter_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.Tag is not string columnName) return;
+
+            EnsureFilterPopup();
+            RewireFilterPopupEvents(
+                CurrentActiveFilterPopup_FilterApplied,
+                CurrentActiveFilterPopup_FilterCleared);
+
+            _currentActiveFilters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+
+            _filterPopup!.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void CurrentActiveFilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+
+            if (e.FilterState.IsActive)
+            {
+                _currentActiveFilters[e.FilterState.ColumnName] = e.FilterState;
+            }
+            else
+            {
+                _currentActiveFilters.Remove(e.FilterState.ColumnName);
+            }
+
+            ApplyCurrentActiveFilters();
+            UpdateDataGridFilterButtonStyles(CurrentActiveQueriesDataGrid, _currentActiveFilters);
+        }
+
+        private void CurrentActiveFilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+        }
+
+        private void ApplyCurrentActiveFilters()
+        {
+            if (_currentActiveUnfilteredData == null) return;
+
+            if (_currentActiveFilters.Count == 0)
+            {
+                CurrentActiveQueriesDataGrid.ItemsSource = _currentActiveUnfilteredData;
+                return;
+            }
+
+            var filteredData = _currentActiveUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _currentActiveFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }).ToList();
+
+            CurrentActiveQueriesDataGrid.ItemsSource = filteredData;
+        }
+
+        private void DownloadCurrentActiveEstPlan_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.DataContext is not LiveQueryItem item) return;
+
+            if (string.IsNullOrEmpty(item.QueryPlan))
+            {
+                MessageBox.Show("No estimated plan is available for this query.", "No Plan Available",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            var timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
+            var defaultFileName = $"estimated_plan_{item.SessionId}_{timestamp}.sqlplan";
+
+            var saveFileDialog = new SaveFileDialog
+            {
+                FileName = defaultFileName,
+                DefaultExt = ".sqlplan",
+                Filter = "SQL Plan (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+                Title = "Save Query Plan"
+            };
+
+            if (saveFileDialog.ShowDialog() == true)
+            {
+                File.WriteAllText(saveFileDialog.FileName, item.QueryPlan);
+            }
+        }
+
+        private void DownloadCurrentActiveLivePlan_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.DataContext is not LiveQueryItem item) return;
+
+            if (string.IsNullOrEmpty(item.LiveQueryPlan))
+            {
+                MessageBox.Show(
+                    "No live query plan is available for this session. The query may have completed before the plan could be captured.",
+                    "No Plan Available",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+                return;
+            }
+
+            var timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
+            var defaultFileName = $"live_plan_{item.SessionId}_{timestamp}.sqlplan";
+
+            var saveFileDialog = new SaveFileDialog
+            {
+                FileName = defaultFileName,
+                DefaultExt = ".sqlplan",
+                Filter = "SQL Plan (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+                Title = "Save Live Query Plan"
+            };
+
+            if (saveFileDialog.ShowDialog() == true)
+            {
+                File.WriteAllText(saveFileDialog.FileName, item.LiveQueryPlan);
+            }
+        }
+
+        private async void ViewEstimatedPlan_Click(object sender, RoutedEventArgs e)
+        {
+            var item = GetContextMenuDataItem(sender);
+            if (item == null) return;
+
+            string? planXml = null;
+            string? queryText = null;
+            string label = "Estimated Plan";
+
+            switch (item)
+            {
+                case QuerySnapshotItem snap when !string.IsNullOrEmpty(snap.QueryPlan):
+                    planXml = snap.QueryPlan;
+                    queryText = snap.QueryText;
+                    label = $"Est Plan - SPID {snap.SessionId}";
+                    break;
+                case LiveQueryItem live when !string.IsNullOrEmpty(live.LiveQueryPlan):
+                    planXml = live.LiveQueryPlan;
+                    queryText = live.QueryText;
+                    label = $"Plan - SPID {live.SessionId}";
+                    break;
+                case LiveQueryItem live when !string.IsNullOrEmpty(live.QueryPlan):
+                    planXml = live.QueryPlan;
+                    queryText = live.QueryText;
+                    label = $"Est Plan - SPID {live.SessionId}";
+                    break;
+                case QueryStatsItem stats when !string.IsNullOrEmpty(stats.QueryPlanXml):
+                    planXml = stats.QueryPlanXml;
+                    queryText = stats.QueryText;
+                    label = $"Est Plan - {stats.QueryHash}";
+                    break;
+                case ProcedureStatsItem proc when !string.IsNullOrEmpty(proc.QueryPlanXml):
+                    planXml = proc.QueryPlanXml;
+                    queryText = proc.ObjectName;
+                    label = $"Est Plan - {proc.ProcedureName}";
+                    break;
+                case QueryStoreItem qs:
+                    if (string.IsNullOrEmpty(qs.QueryPlanXml) && _databaseService != null)
+                    {
+                        qs.QueryPlanXml = await _databaseService.GetQueryStorePlanXmlAsync(qs.DatabaseName, qs.QueryId);
+                    }
+                    planXml = qs.QueryPlanXml;
+                    queryText = qs.QueryText;
+                    label = $"Est Plan - QS {qs.QueryId}";
+                    break;
+                case QueryStoreRegressionItem reg:
+                    if (string.IsNullOrEmpty(reg.QueryPlanXml) && _databaseService != null)
+                    {
+                        reg.QueryPlanXml = await _databaseService.GetQueryStorePlanXmlAsync(reg.DatabaseName, reg.QueryId);
+                    }
+                    planXml = reg.QueryPlanXml;
+                    queryText = reg.QueryTextSample;
+                    label = $"Est Plan - QS {reg.QueryId}";
+                    break;
+            }
+
+            if (planXml != null)
+            {
+                ViewPlanRequested?.Invoke(planXml, label, queryText);
+            }
+            else
+            {
+                MessageBox.Show(
+                    "No query plan is available for this row. The plan may have been evicted from the plan cache since it was last collected.",
+                    "No Plan Available",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+            }
+        }
+
+        private async void GetActualPlan_Click(object sender, RoutedEventArgs e)
+        {
+            if (_databaseService == null) return;
+
+            var item = GetContextMenuDataItem(sender);
+            if (item == null) return;
+
+            string? queryText = null;
+            string? databaseName = null;
+            string? planXml = null;
+            string? isolationLevel = null;
+            string label = "Actual Plan";
+
+            switch (item)
+            {
+                case QuerySnapshotItem snap:
+                    queryText = snap.QueryText;
+                    databaseName = snap.DatabaseName;
+                    planXml = snap.QueryPlan;
+                    label = $"Actual Plan - SPID {snap.SessionId}";
+                    break;
+                case LiveQueryItem live:
+                    queryText = live.QueryText;
+                    databaseName = live.DatabaseName;
+                    planXml = live.LiveQueryPlan ?? live.QueryPlan;
+                    label = $"Actual Plan - SPID {live.SessionId}";
+                    break;
+                case QueryStatsItem stats:
+                    queryText = stats.QueryText;
+                    databaseName = stats.DatabaseName;
+                    planXml = stats.QueryPlanXml;
+                    label = $"Actual Plan - {stats.QueryHash}";
+                    break;
+                case QueryStoreItem qs:
+                    queryText = qs.QueryText;
+                    databaseName = qs.DatabaseName;
+                    if (string.IsNullOrEmpty(qs.QueryPlanXml))
+                        qs.QueryPlanXml = await _databaseService.GetQueryStorePlanXmlAsync(qs.DatabaseName, qs.QueryId);
+                    planXml = qs.QueryPlanXml;
+                    label = $"Actual Plan - QS {qs.QueryId}";
+                    break;
+                case QueryStoreRegressionItem reg:
+                    queryText = reg.QueryTextSample;
+                    databaseName = reg.DatabaseName;
+                    if (string.IsNullOrEmpty(reg.QueryPlanXml))
+                        reg.QueryPlanXml = await _databaseService.GetQueryStorePlanXmlAsync(reg.DatabaseName, reg.QueryId);
+                    planXml = reg.QueryPlanXml;
+                    label = $"Actual Plan - QS {reg.QueryId}";
+                    break;
+            }
+
+            if (string.IsNullOrWhiteSpace(queryText))
+            {
+                MessageBox.Show("No query text available for this row.", "No Query Text",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+            }
+
+            var result = MessageBox.Show(
+                $"You are about to execute this query against the monitored server in database [{databaseName ?? "default"}].\n\n" +
+                "Make sure you understand what the query does before proceeding.\n" +
+                "The query will execute with SET STATISTICS XML ON to capture the actual plan.\n" +
+                "All data results will be discarded.",
+                "Get Actual Plan",
+                MessageBoxButton.OKCancel,
+                MessageBoxImage.Warning);
+
+            if (result != MessageBoxResult.OK) return;
+
+            ActualPlanStarted?.Invoke(label);
+
+            _actualPlanCts?.Dispose();
+            _actualPlanCts = new CancellationTokenSource();
+
+            try
+            {
+                _statusCallback?.Invoke("Executing query for actual plan...");
+
+                var actualPlanXml = await ActualPlanExecutor.ExecuteForActualPlanAsync(
+                    _databaseService.ConnectionString,
+                    databaseName ?? "",
+                    queryText,
+                    planXml,
+                    isolationLevel,
+                    isAzureSqlDb: false,
+                    timeoutSeconds: 0,
+                    _actualPlanCts.Token);
+
+                if (!string.IsNullOrEmpty(actualPlanXml))
+                {
+                    ViewPlanRequested?.Invoke(actualPlanXml, label, queryText);
+                    _statusCallback?.Invoke("Actual plan captured successfully.");
+                }
+                else
+                {
+                    MessageBox.Show("Query executed but no execution plan was captured.",
+                        "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
+                    _statusCallback?.Invoke("No actual plan captured.");
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                MessageBox.Show("The query was cancelled or timed out.",
+                    "Cancelled", MessageBoxButton.OK, MessageBoxImage.Information);
+                _statusCallback?.Invoke("Actual plan capture cancelled.");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Failed to get actual plan:\n\n{ex.Message}",
+                    "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                _statusCallback?.Invoke("Actual plan capture failed.");
+            }
+            finally
+            {
+                ActualPlanFinished?.Invoke();
+            }
+        }
+
+        private static object? GetContextMenuDataItem(object sender)
+        {
+            if (sender is not MenuItem menuItem) return null;
+            var contextMenu = menuItem.Parent as ContextMenu;
+
+            // Context menu is on a DataGridRow — get its DataContext
+            if (contextMenu?.PlacementTarget is DataGridRow row)
+                return row.DataContext;
+
+            return null;
+        }
+
+        #endregion
+
         #region Query Stats
 
         private void QueryStatsFilter_Click(object sender, RoutedEventArgs e)
@@ -792,6 +1225,38 @@ private void QueryStoreDataGrid_MouseDoubleClick(object sender, MouseButtonEvent
             }
         }
 
+        private void QueryStoreRegressionsDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (!TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
+            if (_databaseService == null) return;
+
+            if (QueryStoreRegressionsDataGrid.SelectedItem is QueryStoreRegressionItem item)
+            {
+                if (string.IsNullOrEmpty(item.DatabaseName) || item.QueryId <= 0)
+                {
+                    MessageBox.Show(
+                        "Unable to show history: missing database name or query ID.",
+                        "Information",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Information
+                    );
+                    return;
+                }
+
+                var historyWindow = new QueryExecutionHistoryWindow(
+                    _databaseService,
+                    item.DatabaseName,
+                    item.QueryId,
+                    "Query Store",
+                    _queryStoreHoursBack,
+                    _queryStoreFromDate,
+                    _queryStoreToDate
+                );
+                historyWindow.Owner = Window.GetWindow(this);
+                historyWindow.ShowDialog();
+            }
+        }
+
         private void ProcStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             if (!TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
@@ -818,7 +1283,9 @@ private void ProcStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEventA
                     item.FullObjectName ?? item.ObjectName ?? $"ObjectId_{item.ObjectId}",
                     _procStatsHoursBack,
                     _procStatsFromDate,
-                    _procStatsToDate
+                    _procStatsToDate,
+                    item.SchemaName,
+                    item.ProcedureName
                 );
                 historyWindow.Owner = Window.GetWindow(this);
                 historyWindow.ShowDialog();
@@ -872,6 +1339,7 @@ private async Task RefreshQueryStoreRegressionsAsync()
                 var data = await _databaseService.GetQueryStoreRegressionsAsync(_qsRegressionsHoursBack, _qsRegressionsFromDate, _qsRegressionsToDate);
                 QueryStoreRegressionsDataGrid.ItemsSource = data;
                 QueryStoreRegressionsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                SetInitialSort(QueryStoreRegressionsDataGrid, "DurationRegressionPercent", ListSortDirection.Descending);
                 SetStatus($"Loaded {data.Count} query store regression records");
             }
             catch (Exception ex)
@@ -883,14 +1351,78 @@ private async Task RefreshQueryStoreRegressionsAsync()
             }
         }
 
-        private void QueryStoreRegressionsFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        private void QsRegressionsFilter_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.Tag is not string columnName) return;
+
+            EnsureFilterPopup();
+            RewireFilterPopupEvents(
+                QsRegressionsFilterPopup_FilterApplied,
+                QsRegressionsFilterPopup_FilterCleared);
+
+            _qsRegressionsFilters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+
+            _filterPopup!.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void QsRegressionsFilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+
+            if (e.FilterState.IsActive)
+            {
+                _qsRegressionsFilters[e.FilterState.ColumnName] = e.FilterState;
+            }
+            else
+            {
+                _qsRegressionsFilters.Remove(e.FilterState.ColumnName);
+            }
+
+            ApplyQsRegressionsFilters();
+            UpdateDataGridFilterButtonStyles(QueryStoreRegressionsDataGrid, _qsRegressionsFilters);
+        }
+
+        private void QsRegressionsFilterPopup_FilterCleared(object? sender, EventArgs e)
         {
-            DataGridFilterService.ApplyFilter(QueryStoreRegressionsDataGrid, sender as TextBox);
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
         }
 
-        private void QueryStoreRegressionsNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        private void ApplyQsRegressionsFilters()
         {
-            DataGridFilterService.ApplyFilter(QueryStoreRegressionsDataGrid, sender as TextBox);
+            if (_qsRegressionsUnfilteredData == null)
+            {
+                _qsRegressionsUnfilteredData = QueryStoreRegressionsDataGrid.ItemsSource as List<QueryStoreRegressionItem>;
+                if (_qsRegressionsUnfilteredData == null && QueryStoreRegressionsDataGrid.ItemsSource != null)
+                {
+                    _qsRegressionsUnfilteredData = (QueryStoreRegressionsDataGrid.ItemsSource as IEnumerable<QueryStoreRegressionItem>)?.ToList();
+                }
+            }
+
+            if (_qsRegressionsUnfilteredData == null) return;
+
+            if (_qsRegressionsFilters.Count == 0)
+            {
+                QueryStoreRegressionsDataGrid.ItemsSource = _qsRegressionsUnfilteredData;
+                return;
+            }
+
+            var filteredData = _qsRegressionsUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _qsRegressionsFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }).ToList();
+
+            QueryStoreRegressionsDataGrid.ItemsSource = filteredData;
         }
 
         #endregion
@@ -908,6 +1440,7 @@ private async Task RefreshLongRunningPatternsAsync()
                 var data = await _databaseService.GetLongRunningQueryPatternsAsync(_lrqPatternsHoursBack, _lrqPatternsFromDate, _lrqPatternsToDate);
                 LongRunningQueryPatternsDataGrid.ItemsSource = data;
                 LongRunningQueryPatternsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                SetInitialSort(LongRunningQueryPatternsDataGrid, "AvgDurationSec", ListSortDirection.Descending);
                 SetStatus($"Loaded {data.Count} long running query pattern records");
             }
             catch (Exception ex)
@@ -917,14 +1450,109 @@ private async Task RefreshLongRunningPatternsAsync()
             }
         }
 
-        private void LongRunningQueryPatternsFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        private void LrqPatternsFilter_Click(object sender, RoutedEventArgs e)
         {
-            DataGridFilterService.ApplyFilter(LongRunningQueryPatternsDataGrid, sender as TextBox);
+            if (sender is not Button button || button.Tag is not string columnName) return;
+
+            EnsureFilterPopup();
+            RewireFilterPopupEvents(
+                LrqPatternsFilterPopup_FilterApplied,
+                LrqPatternsFilterPopup_FilterCleared);
+
+            _lrqPatternsFilters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+
+            _filterPopup!.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void LrqPatternsFilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+
+            if (e.FilterState.IsActive)
+            {
+                _lrqPatternsFilters[e.FilterState.ColumnName] = e.FilterState;
+            }
+            else
+            {
+                _lrqPatternsFilters.Remove(e.FilterState.ColumnName);
+            }
+
+            ApplyLrqPatternsFilters();
+            UpdateDataGridFilterButtonStyles(LongRunningQueryPatternsDataGrid, _lrqPatternsFilters);
+        }
+
+        private void LrqPatternsFilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
         }
 
-        private void LongRunningQueryPatternsNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        private void ApplyLrqPatternsFilters()
         {
-            DataGridFilterService.ApplyFilter(LongRunningQueryPatternsDataGrid, sender as TextBox);
+            if (_lrqPatternsUnfilteredData == null)
+            {
+                _lrqPatternsUnfilteredData = LongRunningQueryPatternsDataGrid.ItemsSource as List<LongRunningQueryPatternItem>;
+                if (_lrqPatternsUnfilteredData == null && LongRunningQueryPatternsDataGrid.ItemsSource != null)
+                {
+                    _lrqPatternsUnfilteredData = (LongRunningQueryPatternsDataGrid.ItemsSource as IEnumerable<LongRunningQueryPatternItem>)?.ToList();
+                }
+            }
+
+            if (_lrqPatternsUnfilteredData == null) return;
+
+            if (_lrqPatternsFilters.Count == 0)
+            {
+                LongRunningQueryPatternsDataGrid.ItemsSource = _lrqPatternsUnfilteredData;
+                return;
+            }
+
+            var filteredData = _lrqPatternsUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _lrqPatternsFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }).ToList();
+
+            LongRunningQueryPatternsDataGrid.ItemsSource = filteredData;
+        }
+
+        private void LongRunningQueryPatternsDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (!TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
+            if (_databaseService == null) return;
+
+            if (LongRunningQueryPatternsDataGrid.SelectedItem is LongRunningQueryPatternItem item)
+            {
+                if (string.IsNullOrEmpty(item.DatabaseName) || string.IsNullOrEmpty(item.QueryPattern))
+                {
+                    MessageBox.Show(
+                        "Unable to show history: missing database name or query pattern.",
+                        "Information",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Information
+                    );
+                    return;
+                }
+
+                var historyWindow = new TracePatternHistoryWindow(
+                    _databaseService,
+                    item.DatabaseName,
+                    item.QueryPattern,
+                    _lrqPatternsHoursBack,
+                    _lrqPatternsFromDate,
+                    _lrqPatternsToDate
+                );
+                historyWindow.Owner = Window.GetWindow(this);
+                historyWindow.ShowDialog();
+            }
         }
 
         #endregion
@@ -1089,7 +1717,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -1192,15 +1820,15 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column), TabHelpers.CsvSeparator));
                                 }
                             }
-                            sb.AppendLine(string.Join(",", headers));
+                            sb.AppendLine(string.Join(TabHelpers.CsvSeparator, headers));
 
                             foreach (var item in dataGrid.Items)
                             {
                                 var values = TabHelpers.GetRowValues(dataGrid, item);
-                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                                sb.AppendLine(string.Join(TabHelpers.CsvSeparator, values.Select(v => TabHelpers.EscapeCsvField(v, TabHelpers.CsvSeparator))));
                             }
 
                             File.WriteAllText(saveFileDialog.FileName, sb.ToString());
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml b/Dashboard/Controls/ResourceMetricsContent.xaml
index 4eeb5f6c..2801a3e5 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml
@@ -44,9 +44,14 @@
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <TextBlock Text="CPU Utilization (%)" FontWeight="Bold" FontSize="14" Margin="10,5" Foreground="{DynamicResource ForegroundBrush}"/>
                         <ScottPlot:WpfPlot Grid.Row="1" x:Name="ServerUtilTrendsCpuChart" Margin="5"/>
+                        <TextBlock Grid.Row="2" x:Name="CpuSchedulerStatusText"
+                                   Margin="10,0,10,5" FontSize="11"
+                                   HorizontalAlignment="Center"
+                                   Foreground="{DynamicResource ForegroundBrush}"/>
                     </Grid>
                 </Border>
 
@@ -201,38 +206,77 @@
             </Grid>
         </TabItem>
 
-        <!-- File I/O Latency Sub-Tab - User DB only, TempDB moved to TempDB Stats -->
-        <TabItem Header="File I/O Latency">
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-
-                <!-- User DB Read Latency -->
-                <Border Grid.Row="0" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="0,0,0,2">
-                    <Grid>
+        <!-- File I/O Sub-Tab -->
+        <TabItem Header="File I/O">
+            <TabControl Background="Transparent" BorderThickness="0">
+                <!-- File I/O Latency sub-tab -->
+                <TabItem Header="File I/O Latency">
+                    <Grid Margin="5">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Grid.Row="0" Text="User DB Read Latency (ms)" FontWeight="Bold" FontSize="11" Margin="5,3" Foreground="{DynamicResource ForegroundBrush}"/>
-                        <ScottPlot:WpfPlot x:Name="UserDbReadLatencyChart" Grid.Row="1"/>
+
+                        <!-- User DB Read Latency -->
+                        <Border Grid.Row="0" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="0,0,0,2">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Text="User DB Read Latency (ms)" FontWeight="Bold" FontSize="11" Margin="5,3" Foreground="{DynamicResource ForegroundBrush}"/>
+                                <ScottPlot:WpfPlot x:Name="UserDbReadLatencyChart" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+
+                        <!-- User DB Write Latency -->
+                        <Border Grid.Row="1" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="0,2,0,0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Text="User DB Write Latency (ms)" FontWeight="Bold" FontSize="11" Margin="5,3" Foreground="{DynamicResource ForegroundBrush}"/>
+                                <ScottPlot:WpfPlot x:Name="UserDbWriteLatencyChart" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
                     </Grid>
-                </Border>
+                </TabItem>
 
-                <!-- User DB Write Latency -->
-                <Border Grid.Row="1" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="0,2,0,0">
-                    <Grid>
+                <!-- File I/O Throughput sub-tab -->
+                <TabItem Header="File I/O Throughput">
+                    <Grid Margin="5">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Grid.Row="0" Text="User DB Write Latency (ms)" FontWeight="Bold" FontSize="11" Margin="5,3" Foreground="{DynamicResource ForegroundBrush}"/>
-                        <ScottPlot:WpfPlot x:Name="UserDbWriteLatencyChart" Grid.Row="1"/>
+
+                        <!-- User DB Read Throughput -->
+                        <Border Grid.Row="0" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="0,0,0,2">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Text="User DB Read Throughput (MB/s)" FontWeight="Bold" FontSize="11" Margin="5,3" Foreground="{DynamicResource ForegroundBrush}"/>
+                                <ScottPlot:WpfPlot x:Name="FileIoReadThroughputChart" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+
+                        <!-- User DB Write Throughput -->
+                        <Border Grid.Row="1" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Margin="0,2,0,0">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Text="User DB Write Throughput (MB/s)" FontWeight="Bold" FontSize="11" Margin="5,3" Foreground="{DynamicResource ForegroundBrush}"/>
+                                <ScottPlot:WpfPlot x:Name="FileIoWriteThroughputChart" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
                     </Grid>
-                </Border>
-            </Grid>
+                </TabItem>
+            </TabControl>
         </TabItem>
 
         <!-- Perfmon Counters Sub-Tab -->
@@ -250,20 +294,24 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                             <RowDefinition Height="*"/>
                         </Grid.RowDefinitions>
                         <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="5,5,5,2">
                             <TextBlock Text="Select Counters" FontWeight="Bold" VerticalAlignment="Center" Foreground="{DynamicResource ForegroundBrush}"/>
                             <Button Content="Refresh" Click="PerfmonCounters_Refresh_Click" Margin="10,0,0,0" Padding="8,2" Style="{StaticResource SuccessButton}" FontSize="11"/>
                         </StackPanel>
-                        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5,2">
+                        <ComboBox Grid.Row="1" x:Name="PerfmonPackCombo"
+                                  SelectionChanged="PerfmonPack_SelectionChanged"
+                                  Margin="5,2" FontSize="11"/>
+                        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="5,2">
                             <Button Content="Select All" Click="PerfmonCounters_SelectAll_Click" Padding="6,2" FontSize="10" Margin="0,0,5,0"/>
                             <Button Content="Clear All" Click="PerfmonCounters_ClearAll_Click" Padding="6,2" FontSize="10"/>
                         </StackPanel>
-                        <TextBox Grid.Row="2" x:Name="PerfmonCounterSearchBox" Margin="5,2" Height="24" FontSize="11"
+                        <TextBox Grid.Row="3" x:Name="PerfmonCounterSearchBox" Margin="5,2" Height="24" FontSize="11"
                                  TextChanged="PerfmonCounterSearch_TextChanged"
                                  ToolTip="Type to filter counters"/>
-                        <ListBox Grid.Row="3" x:Name="PerfmonCountersList" Margin="5" Background="{DynamicResource BackgroundDarkBrush}" Foreground="{DynamicResource ForegroundBrush}"
+                        <ListBox Grid.Row="4" x:Name="PerfmonCountersList" Margin="5" Background="{DynamicResource BackgroundDarkBrush}" Foreground="{DynamicResource ForegroundBrush}"
                                  SelectionMode="Multiple"
                                  ScrollViewer.VerticalScrollBarVisibility="Auto"
                                  SelectionChanged="PerfmonCountersList_SelectionChanged">
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 3665466f..9c8c8896 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -16,6 +16,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
 using System.Windows.Media;
 using Microsoft.Win32;
 using PerformanceMonitorDashboard.Models;
@@ -86,6 +87,8 @@ public partial class ResourceMetricsContent : UserControl
         private Helpers.ChartHoverHelper? _spinlockStatsHover;
         private Helpers.ChartHoverHelper? _fileIoReadHover;
         private Helpers.ChartHoverHelper? _fileIoWriteHover;
+        private Helpers.ChartHoverHelper? _fileIoReadThroughputHover;
+        private Helpers.ChartHoverHelper? _fileIoWriteThroughputHover;
         private Helpers.ChartHoverHelper? _perfmonHover;
         private Helpers.ChartHoverHelper? _waitStatsHover;
         private Helpers.ChartHoverHelper? _tempdbStatsHover;
@@ -111,6 +114,8 @@ public ResourceMetricsContent()
             _spinlockStatsHover = new Helpers.ChartHoverHelper(SpinlockStatsChart, "collisions/sec");
             _fileIoReadHover = new Helpers.ChartHoverHelper(UserDbReadLatencyChart, "ms");
             _fileIoWriteHover = new Helpers.ChartHoverHelper(UserDbWriteLatencyChart, "ms");
+            _fileIoReadThroughputHover = new Helpers.ChartHoverHelper(FileIoReadThroughputChart, "MB/s");
+            _fileIoWriteThroughputHover = new Helpers.ChartHoverHelper(FileIoWriteThroughputChart, "MB/s");
             _perfmonHover = new Helpers.ChartHoverHelper(PerfmonCountersChart, "");
             _waitStatsHover = new Helpers.ChartHoverHelper(WaitStatsDetailChart, "ms/sec");
             _tempdbStatsHover = new Helpers.ChartHoverHelper(TempdbStatsChart, "MB");
@@ -146,6 +151,10 @@ private void SetupChartContextMenus()
             // File I/O Latency charts
             TabHelpers.SetupChartContextMenu(UserDbReadLatencyChart, "UserDB_Read_Latency", "collect.file_io_stats");
             TabHelpers.SetupChartContextMenu(UserDbWriteLatencyChart, "UserDB_Write_Latency", "collect.file_io_stats");
+
+            // File I/O Throughput charts
+            TabHelpers.SetupChartContextMenu(FileIoReadThroughputChart, "UserDB_Read_Throughput", "collect.file_io_stats");
+            TabHelpers.SetupChartContextMenu(FileIoWriteThroughputChart, "UserDB_Write_Throughput", "collect.file_io_stats");
             TabHelpers.SetupChartContextMenu(TempDbLatencyChart, "TempDB_Latency", "collect.file_io_stats");
 
             // Server Utilization Trends charts
@@ -225,6 +234,7 @@ await Task.WhenAll(
                     RefreshTempdbStatsAsync(),
                     RefreshSessionStatsAsync(),
                     LoadFileIoLatencyChartsAsync(),
+                    LoadFileIoThroughputChartsAsync(),
                     RefreshServerTrendsAsync(),
                     RefreshPerfmonCountersTabAsync(),
                     RefreshWaitStatsDetailTabAsync()
@@ -837,11 +847,11 @@ private async Task LoadFileIoLatencyChartsAsync()
 
             // Load User DB data only - TempDB latency moved to TempDB Stats tab
             var userDbData = await _databaseService.GetFileIoLatencyTimeSeriesAsync(isTempDb: false, _fileIoHoursBack, _fileIoFromDate, _fileIoToDate);
-            LoadFileIoChart(UserDbReadLatencyChart, userDbData, d => d.ReadLatencyMs, "Read Latency (ms)", colors, xMin, xMax, _fileIoReadHover);
-            LoadFileIoChart(UserDbWriteLatencyChart, userDbData, d => d.WriteLatencyMs, "Write Latency (ms)", colors, xMin, xMax, _fileIoWriteHover);
+            LoadFileIoChart(UserDbReadLatencyChart, userDbData, d => d.ReadLatencyMs, "Read Latency (ms)", colors, xMin, xMax, _fileIoReadHover, d => d.ReadQueuedLatencyMs);
+            LoadFileIoChart(UserDbWriteLatencyChart, userDbData, d => d.WriteLatencyMs, "Write Latency (ms)", colors, xMin, xMax, _fileIoWriteHover, d => d.WriteQueuedLatencyMs);
         }
 
-        private void LoadFileIoChart(ScottPlot.WPF.WpfPlot chart, List<FileIoLatencyTimeSeriesItem> data, Func<FileIoLatencyTimeSeriesItem, decimal> latencySelector, string yLabel, ScottPlot.Color[] colors, double xMin, double xMax, Helpers.ChartHoverHelper? hover = null)
+        private void LoadFileIoChart(ScottPlot.WPF.WpfPlot chart, List<FileIoLatencyTimeSeriesItem> data, Func<FileIoLatencyTimeSeriesItem, decimal> latencySelector, string yLabel, ScottPlot.Color[] colors, double xMin, double xMax, Helpers.ChartHoverHelper? hover = null, Func<FileIoLatencyTimeSeriesItem, decimal>? queuedSelector = null)
         {
             DateTime rangeStart = DateTime.FromOADate(xMin);
             DateTime rangeEnd = DateTime.FromOADate(xMax);
@@ -856,6 +866,9 @@ private void LoadFileIoChart(ScottPlot.WPF.WpfPlot chart, List<FileIoLatencyTime
             TabHelpers.ApplyDarkModeToChart(chart);
             hover?.Clear();
 
+            // Check if any queued data exists (only render overlay if there's real data)
+            bool hasQueuedData = queuedSelector != null && data != null && data.Any(d => queuedSelector(d) > 0);
+
             if (data != null && data.Count > 0)
             {
                 // Get all unique time points for gap filling
@@ -879,13 +892,31 @@ private void LoadFileIoChart(ScottPlot.WPF.WpfPlot chart, List<FileIoLatencyTime
                         var scatter = chart.Plot.Add.Scatter(xs, ys);
                         scatter.LineWidth = 2;
                         scatter.MarkerSize = 5;
-                        scatter.Color = colors[colorIndex % colors.Length];
+                        var color = colors[colorIndex % colors.Length];
+                        scatter.Color = color;
 
                         // Use just the filename for legend (not database.filename which is redundant)
                         var fileName = fileData.First().FileName;
                         scatter.LegendText = fileName;
                         hover?.Add(scatter, fileName);
 
+                        // Add queued I/O overlay as dashed line with same color
+                        if (hasQueuedData)
+                        {
+                            var queuedValues = fileData.Select(d => (double)queuedSelector!(d));
+                            if (queuedValues.Any(v => v > 0))
+                            {
+                                var (qxs, qys) = TabHelpers.FillTimeSeriesGaps(timePoints, queuedValues);
+                                var queuedScatter = chart.Plot.Add.Scatter(qxs, qys);
+                                queuedScatter.LineWidth = 2;
+                                queuedScatter.MarkerSize = 0;
+                                queuedScatter.Color = color;
+                                queuedScatter.LinePattern = ScottPlot.LinePattern.Dashed;
+                                queuedScatter.LegendText = $"{fileName} (queued)";
+                                hover?.Add(queuedScatter, $"{fileName} (queued)");
+                            }
+                        }
+
                         colorIndex++;
                     }
                 }
@@ -913,6 +944,22 @@ private void LoadFileIoChart(ScottPlot.WPF.WpfPlot chart, List<FileIoLatencyTime
             chart.Refresh();
         }
 
+        private async Task LoadFileIoThroughputChartsAsync()
+        {
+            if (_databaseService == null) return;
+
+            DateTime rangeEnd = _fileIoToDate ?? Helpers.ServerTimeHelper.ServerNow;
+            DateTime rangeStart = _fileIoFromDate ?? rangeEnd.AddHours(-_fileIoHoursBack);
+            double xMin = rangeStart.ToOADate();
+            double xMax = rangeEnd.ToOADate();
+
+            var colors = TabHelpers.ChartColors;
+
+            var throughputData = await _databaseService.GetFileIoThroughputTimeSeriesAsync(isTempDb: false, _fileIoHoursBack, _fileIoFromDate, _fileIoToDate);
+            LoadFileIoChart(FileIoReadThroughputChart, throughputData, d => d.ReadThroughputMbPerSec, "Read Throughput (MB/s)", colors, xMin, xMax, _fileIoReadThroughputHover);
+            LoadFileIoChart(FileIoWriteThroughputChart, throughputData, d => d.WriteThroughputMbPerSec, "Write Throughput (MB/s)", colors, xMin, xMax, _fileIoWriteThroughputHover);
+        }
+
         #endregion
 
         #region Server Trends Tab
@@ -936,6 +983,16 @@ private async Task RefreshServerTrendsAsync()
                 LoadServerTrendsTempdbChart(await tempdbTask, _serverTrendsHoursBack, _serverTrendsFromDate, _serverTrendsToDate);
                 LoadServerTrendsMemoryChart(await memoryTask, _serverTrendsHoursBack, _serverTrendsFromDate, _serverTrendsToDate);
                 LoadServerTrendsPerfmonChart(await perfmonTask, _serverTrendsHoursBack, _serverTrendsFromDate, _serverTrendsToDate);
+
+                try
+                {
+                    var pressure = await _databaseService.GetCpuPressureAsync();
+                    UpdateCpuSchedulerStatus(pressure);
+                }
+                catch (Exception pressureEx)
+                {
+                    Logger.Error($"Error loading CPU scheduler pressure: {pressureEx.Message}", pressureEx);
+                }
             }
             catch (Exception ex)
             {
@@ -943,6 +1000,41 @@ private async Task RefreshServerTrendsAsync()
             }
         }
 
+        private void UpdateCpuSchedulerStatus(CpuPressureItem? pressure)
+        {
+            if (pressure == null)
+            {
+                CpuSchedulerStatusText.Text = "";
+                return;
+            }
+
+            CpuSchedulerStatusText.Inlines.Clear();
+
+            var summary = $"Schedulers: {pressure.TotalSchedulers} | " +
+                          $"Workers: {pressure.TotalWorkers:N0}/{pressure.MaxWorkers:N0} ({pressure.WorkerUtilizationPercent:F1}%) | " +
+                          $"Runnable: {pressure.TotalRunnableTasks} ({pressure.AvgRunnableTasksPerScheduler:F2}/sched) | " +
+                          $"Active: {pressure.TotalActiveRequests} | " +
+                          $"Queued: {pressure.TotalQueuedRequests} | ";
+
+            CpuSchedulerStatusText.Inlines.Add(new Run(summary));
+
+            var levelText = pressure.PressureLevel;
+            var levelRun = new Run(levelText);
+
+            if (levelText.Contains("CRITICAL") || levelText.Contains("HIGH"))
+            {
+                levelRun.Foreground = new SolidColorBrush(Color.FromRgb(0xFF, 0x44, 0x44));
+                levelRun.FontWeight = FontWeights.Bold;
+            }
+            else if (levelText.Contains("MEDIUM"))
+            {
+                levelRun.Foreground = new SolidColorBrush(Color.FromRgb(0xFF, 0xA5, 0x00));
+                levelRun.FontWeight = FontWeights.Bold;
+            }
+
+            CpuSchedulerStatusText.Inlines.Add(levelRun);
+        }
+
         private void LoadServerTrendsCpuChart(IEnumerable<CpuSpikeItem> cpuData, int hoursBack, DateTime? fromDate, DateTime? toDate)
         {
             DateTime rangeEnd = toDate ?? Helpers.ServerTimeHelper.ServerNow;
@@ -1289,7 +1381,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                 {
                     var sb = new StringBuilder();
 
-                    var headers = grid.Columns.Select(c => c.Header?.ToString() ?? string.Empty);
+                    var headers = grid.Columns.Select(c => Helpers.DataGridClipboardBehavior.GetHeaderText(c));
                     sb.AppendLine(string.Join("\t", headers));
 
                     foreach (var item in grid.Items)
@@ -1336,8 +1428,9 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                         {
                             var sb = new StringBuilder();
 
-                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(c.Header?.ToString() ?? string.Empty));
-                            sb.AppendLine(string.Join(",", headers));
+                            var sep = TabHelpers.CsvSeparator;
+                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(c), sep));
+                            sb.AppendLine(string.Join(sep, headers));
 
                             foreach (var item in grid.Items)
                             {
@@ -1348,11 +1441,10 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                                     if (binding != null)
                                     {
                                         var prop = item.GetType().GetProperty(binding.Path.Path);
-                                        var value = prop?.GetValue(item)?.ToString() ?? string.Empty;
-                                        values.Add(TabHelpers.EscapeCsvField(value));
+                                        values.Add(TabHelpers.EscapeCsvField(TabHelpers.FormatForExport(prop?.GetValue(item)), sep));
                                     }
                                 }
-                                sb.AppendLine(string.Join(",", values));
+                                sb.AppendLine(string.Join(sep, values));
                             }
 
                             File.WriteAllText(dialog.FileName, sb.ToString());
@@ -1451,6 +1543,51 @@ private async void PerfmonCounters_ClearAll_Click(object sender, RoutedEventArgs
             await UpdatePerfmonCountersChartAsync();
         }
 
+        private async void PerfmonPack_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_perfmonCounterItems == null || _perfmonCounterItems.Count == 0) return;
+            if (PerfmonPackCombo.SelectedItem is not string pack) return;
+
+            _isUpdatingPerfmonSelection = true;
+
+            /* Clear search so all counters are visible */
+            if (PerfmonCounterSearchBox != null)
+                PerfmonCounterSearchBox.Text = "";
+
+            /* Uncheck everything first */
+            foreach (var item in _perfmonCounterItems)
+                item.IsSelected = false;
+
+            if (pack == PerfmonPacks.AllCounters)
+            {
+                /* "All Counters" selects the General Throughput defaults */
+                var defaultSet = new HashSet<string>(PerfmonPacks.Packs["General Throughput"], StringComparer.OrdinalIgnoreCase);
+                foreach (var item in _perfmonCounterItems)
+                {
+                    if (defaultSet.Contains(item.CounterName))
+                        item.IsSelected = true;
+                }
+            }
+            else if (PerfmonPacks.Packs.TryGetValue(pack, out var packCounters))
+            {
+                var packSet = new HashSet<string>(packCounters, StringComparer.OrdinalIgnoreCase);
+                int count = 0;
+                foreach (var item in _perfmonCounterItems)
+                {
+                    if (count >= 12) break;
+                    if (packSet.Contains(item.CounterName))
+                    {
+                        item.IsSelected = true;
+                        count++;
+                    }
+                }
+            }
+
+            _isUpdatingPerfmonSelection = false;
+            RefreshPerfmonCounterListOrder();
+            await UpdatePerfmonCountersChartAsync();
+        }
+
         private async void PerfmonCounters_Refresh_Click(object sender, RoutedEventArgs e)
         {
             try
@@ -1467,6 +1604,13 @@ private async Task RefreshPerfmonCountersTabAsync()
         {
             if (_databaseService == null) return;
 
+            /* Initialize pack ComboBox once */
+            if (PerfmonPackCombo.Items.Count == 0)
+            {
+                PerfmonPackCombo.ItemsSource = PerfmonPacks.PackNames;
+                PerfmonPackCombo.SelectedItem = "General Throughput";
+            }
+
             try
             {
                 // Lightweight query: get only distinct counter names for the picker
@@ -1487,11 +1631,12 @@ private async Task RefreshPerfmonCountersTabAsync()
                     })
                     .ToList();
 
-                // If nothing was previously selected, default select some useful counters
+                // If nothing was previously selected, default select General Throughput pack
                 if (!counters.Any(c => c.IsSelected))
                 {
-                    var defaultCounters = new[] { "Batch Requests/sec", "SQL Compilations/sec", "SQL Re-Compilations/sec", "Transactions/sec" };
-                    foreach (var item in counters.Where(c => defaultCounters.Contains(c.CounterName)))
+                    var defaultCounters = PerfmonPacks.Packs["General Throughput"];
+                    var defaultSet = new HashSet<string>(defaultCounters, StringComparer.OrdinalIgnoreCase);
+                    foreach (var item in counters.Where(c => defaultSet.Contains(c.CounterName)))
                     {
                         item.IsSelected = true;
                     }
diff --git a/Dashboard/Controls/SystemEventsContent.xaml b/Dashboard/Controls/SystemEventsContent.xaml
index 9d453702..0c9c847a 100644
--- a/Dashboard/Controls/SystemEventsContent.xaml
+++ b/Dashboard/Controls/SystemEventsContent.xaml
@@ -202,7 +202,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding ErrorNumber}" Width="100">
+                    <DataGridTextColumn Binding="{Binding ErrorNumber}" ElementStyle="{StaticResource NumericCell}" Width="100">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ErrorNumber" Click="SevereErrorsFilter_Click" Margin="0,0,4,0"/>
@@ -210,7 +210,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Severity}" Width="80">
+                    <DataGridTextColumn Binding="{Binding Severity}" ElementStyle="{StaticResource NumericCell}" Width="80">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Severity" Click="SevereErrorsFilter_Click" Margin="0,0,4,0"/>
@@ -218,7 +218,7 @@
                             </StackPanel>
                         </DataGridTextColumn.Header>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding State}" Width="70">
+                    <DataGridTextColumn Binding="{Binding State}" ElementStyle="{StaticResource NumericCell}" Width="70">
                         <DataGridTextColumn.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="State" Click="SevereErrorsFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/Controls/SystemEventsContent.xaml.cs b/Dashboard/Controls/SystemEventsContent.xaml.cs
index e17a5ee6..4778838f 100644
--- a/Dashboard/Controls/SystemEventsContent.xaml.cs
+++ b/Dashboard/Controls/SystemEventsContent.xaml.cs
@@ -2120,7 +2120,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     var sb = new StringBuilder();
 
                     // Header row
-                    var headers = grid.Columns.Select(c => c.Header?.ToString() ?? string.Empty);
+                    var headers = grid.Columns.Select(c => Helpers.DataGridClipboardBehavior.GetHeaderText(c));
                     sb.AppendLine(string.Join("\t", headers));
 
                     // Data rows
@@ -2169,8 +2169,9 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             var sb = new StringBuilder();
 
                             // Header row
-                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(c.Header?.ToString() ?? string.Empty));
-                            sb.AppendLine(string.Join(",", headers));
+                            var sep = TabHelpers.CsvSeparator;
+                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(c), sep));
+                            sb.AppendLine(string.Join(sep, headers));
 
                             // Data rows
                             foreach (var item in grid.Items)
@@ -2182,11 +2183,10 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                                     if (binding != null)
                                     {
                                         var prop = item.GetType().GetProperty(binding.Path.Path);
-                                        var value = prop?.GetValue(item)?.ToString() ?? string.Empty;
-                                        values.Add(TabHelpers.EscapeCsvField(value));
+                                        values.Add(TabHelpers.EscapeCsvField(TabHelpers.FormatForExport(prop?.GetValue(item)), sep));
                                     }
                                 }
-                                sb.AppendLine(string.Join(",", values));
+                                sb.AppendLine(string.Join(sep, values));
                             }
 
                             File.WriteAllText(dialog.FileName, sb.ToString());
diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj
index 4f568c24..cbacd1ef 100644
--- a/Dashboard/Dashboard.csproj
+++ b/Dashboard/Dashboard.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>PerformanceMonitorDashboard</AssemblyName>
     <Product>SQL Server Performance Monitor Dashboard</Product>
-    <Version>1.3.0</Version>
+    <Version>2.0.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
@@ -48,5 +48,6 @@
 
   <ItemGroup>
     <Resource Include="EDD.ico" />
+    <Resource Include="Resources\PlanIcons\*.png" />
   </ItemGroup>
 </Project>
diff --git a/Dashboard/Helpers/DataGridClipboardBehavior.cs b/Dashboard/Helpers/DataGridClipboardBehavior.cs
new file mode 100644
index 00000000..4c491ee5
--- /dev/null
+++ b/Dashboard/Helpers/DataGridClipboardBehavior.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace PerformanceMonitorDashboard.Helpers;
+
+/// <summary>
+/// Attached behavior that fixes DataGrid clipboard copy when column headers
+/// use StackPanel (e.g. filter button + text). Without this, copied headers
+/// show "System.Windows.Controls.StackPanel" instead of the column name.
+/// </summary>
+public static class DataGridClipboardBehavior
+{
+    public static readonly DependencyProperty FixHeaderCopyProperty =
+        DependencyProperty.RegisterAttached(
+            "FixHeaderCopy",
+            typeof(bool),
+            typeof(DataGridClipboardBehavior),
+            new PropertyMetadata(false, OnFixHeaderCopyChanged));
+
+    public static bool GetFixHeaderCopy(DependencyObject obj) => (bool)obj.GetValue(FixHeaderCopyProperty);
+    public static void SetFixHeaderCopy(DependencyObject obj, bool value) => obj.SetValue(FixHeaderCopyProperty, value);
+
+    private static void OnFixHeaderCopyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DataGrid grid && (bool)e.NewValue)
+        {
+            grid.CopyingRowClipboardContent += FixHeaderCopy;
+        }
+    }
+
+    /// <summary>
+    /// Extracts the display text from a DataGrid column header.
+    /// Handles StackPanel headers (filter button + TextBlock) by returning the TextBlock text.
+    /// </summary>
+    public static string GetHeaderText(DataGridColumn column)
+    {
+        if (column.Header is StackPanel sp)
+        {
+            var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+            if (tb != null) return tb.Text;
+        }
+        return column.Header?.ToString() ?? "";
+    }
+
+    /// <summary>
+    /// Event handler that can be wired directly to DataGrid.CopyingRowClipboardContent.
+    /// </summary>
+    public static void FixHeaderCopy(object? sender, DataGridRowClipboardEventArgs e)
+    {
+        if (!e.IsColumnHeadersRow) return;
+
+        for (int i = 0; i < e.ClipboardRowContent.Count; i++)
+        {
+            var cell = e.ClipboardRowContent[i];
+            if (cell.Column?.Header is StackPanel sp)
+            {
+                var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+                if (tb != null)
+                {
+                    e.ClipboardRowContent[i] = new DataGridClipboardCellContent(cell.Item, cell.Column, tb.Text);
+                }
+            }
+        }
+    }
+}
diff --git a/Dashboard/Helpers/PerfmonPacks.cs b/Dashboard/Helpers/PerfmonPacks.cs
new file mode 100644
index 00000000..2bc016ed
--- /dev/null
+++ b/Dashboard/Helpers/PerfmonPacks.cs
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Dashboard.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Collections.Generic;
+
+namespace PerformanceMonitorDashboard.Helpers;
+
+public static class PerfmonPacks
+{
+    public const string AllCounters = "All Counters";
+
+    public static readonly string[] PackNames =
+    [
+        AllCounters,
+        "General Throughput",
+        "Memory Pressure",
+        "CPU / Compilation",
+        "I/O Pressure",
+        "TempDB Pressure",
+        "Lock / Blocking",
+    ];
+
+    public static readonly Dictionary<string, string[]> Packs = new()
+    {
+        ["General Throughput"] =
+        [
+            "Batch Requests/sec",
+            "SQL Compilations/sec",
+            "SQL Re-Compilations/sec",
+            "Query optimizations/sec",
+            "Network IO waits",
+        ],
+        ["Memory Pressure"] =
+        [
+            "Memory Grants Pending",
+            "Granted Workspace Memory (KB)",
+            "Target Server Memory (KB)",
+            "Total Server Memory (KB)",
+            "Stolen Server Memory (KB)",
+            "Lock Memory (KB)",
+            "SQL Cache Memory (KB)",
+            "Lazy writes/sec",
+            "Free list stalls/sec",
+            "Reduced memory grants/sec",
+            "Memory grant queue waits",
+            "Thread-safe memory objects waits",
+            "Page reads/sec",
+            "Readahead pages/sec",
+        ],
+        ["CPU / Compilation"] =
+        [
+            "Batch Requests/sec",
+            "SQL Compilations/sec",
+            "SQL Re-Compilations/sec",
+            "Query optimizations/sec",
+            "Active parallel threads",
+            "Active requests",
+            "Queued requests",
+            "Wait for the worker",
+        ],
+        ["I/O Pressure"] =
+        [
+            "Page reads/sec",
+            "Page writes/sec",
+            "Checkpoint pages/sec",
+            "Page lookups/sec",
+            "Readahead pages/sec",
+            "Background writer pages/sec",
+            "Log Flushes/sec",
+            "Log Bytes Flushed/sec",
+            "Log Flush Write Time (ms)",
+            "Page IO latch waits",
+            "Log buffer waits",
+            "Log write waits",
+            "Full Scans/sec",
+            "Index Searches/sec",
+            "Page Splits/sec",
+        ],
+        ["TempDB Pressure"] =
+        [
+            "Version Store Size (KB)",
+            "Free Space in tempdb (KB)",
+            "Active Temp Tables",
+            "Version Generation rate (KB/s)",
+            "Version Cleanup rate (KB/s)",
+            "Temp Tables Creation Rate",
+            "Workfiles Created/sec",
+            "Worktables Created/sec",
+        ],
+        ["Lock / Blocking"] =
+        [
+            "Lock Requests/sec",
+            "Lock Wait Time (ms)",
+            "Lock Waits/sec",
+            "Number of Deadlocks/sec",
+            "Table Lock Escalations/sec",
+            "Blocked tasks",
+            "Lock waits",
+            "Non-Page latch waits",
+            "Page latch waits",
+            "Processes blocked",
+            "Lock Timeouts/sec",
+        ],
+    };
+}
diff --git a/Dashboard/Helpers/TabHelpers.cs b/Dashboard/Helpers/TabHelpers.cs
index 0a671f07..538312e2 100644
--- a/Dashboard/Helpers/TabHelpers.cs
+++ b/Dashboard/Helpers/TabHelpers.cs
@@ -29,6 +29,12 @@ namespace PerformanceMonitorDashboard.Helpers
     public static class TabHelpers
     {
         /// <summary>
+        /// CSV separator character used for exports. Auto-detected from locale by default;
+        /// updated from user preferences when settings are loaded.
+        /// </summary>
+        public static string CsvSeparator { get; set; } =
+            CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == "," ? ";" : ",";
+        /// <summary>
         /// Returns true if a double-click originated from a DataGridRow (not a header).
         /// Use at the top of MouseDoubleClick handlers to prevent header clicks from
         /// triggering row actions.
@@ -307,12 +313,12 @@ private static void ApplyDarkThemeRecursively(DependencyObject parent, Brush dar
         /// <summary>
         /// Escapes a field value for proper CSV formatting.
         /// </summary>
-        public static string EscapeCsvField(string field)
+        public static string EscapeCsvField(string field, string separator = ",")
         {
             if (string.IsNullOrEmpty(field))
                 return string.Empty;
 
-            if (field.Contains(',', StringComparison.Ordinal) || field.Contains('"', StringComparison.Ordinal) || field.Contains('\n', StringComparison.Ordinal))
+            if (field.Contains(separator, StringComparison.Ordinal) || field.Contains('"', StringComparison.Ordinal) || field.Contains('\n', StringComparison.Ordinal))
             {
                 return "\"" + field.Replace("\"", "\"\"", StringComparison.Ordinal) + "\"";
             }
@@ -414,8 +420,7 @@ public static string GetCellContent(DataGrid dataGrid, DataGridCellInfo cellInfo
                 var property = cellInfo.Item.GetType().GetProperty(propertyName);
                 if (property != null)
                 {
-                    var value = property.GetValue(cellInfo.Item);
-                    return value?.ToString() ?? string.Empty;
+                    return FormatForExport(property.GetValue(cellInfo.Item));
                 }
             }
 
@@ -429,7 +434,7 @@ public static string GetCellContent(DataGrid dataGrid, DataGridCellInfo cellInfo
                     if (textBinding != null)
                     {
                         var prop = cellInfo.Item.GetType().GetProperty(textBinding.Path.Path);
-                        return prop?.GetValue(cellInfo.Item)?.ToString() ?? string.Empty;
+                        return FormatForExport(prop?.GetValue(cellInfo.Item));
                     }
                 }
             }
@@ -463,7 +468,7 @@ public static List<string> GetRowValues(DataGrid dataGrid, object item)
                     if (property != null)
                     {
                         var value = property.GetValue(item);
-                        values.Add(value?.ToString() ?? string.Empty);
+                        values.Add(FormatForExport(value));
                     }
                 }
                 /* DataGridTemplateColumn — instantiate the template and find a TextBlock binding */
@@ -476,7 +481,7 @@ public static List<string> GetRowValues(DataGrid dataGrid, object item)
                         if (textBinding != null)
                         {
                             var prop = item.GetType().GetProperty(textBinding.Path.Path);
-                            values.Add(prop?.GetValue(item)?.ToString() ?? string.Empty);
+                            values.Add(FormatForExport(prop?.GetValue(item)));
                         }
                         else
                         {
@@ -492,15 +497,26 @@ public static List<string> GetRowValues(DataGrid dataGrid, object item)
             return values;
         }
 
+        /// <summary>
+        /// Formats a value for CSV/clipboard export using invariant culture.
+        /// </summary>
+        public static string FormatForExport(object? value)
+        {
+            if (value == null) return string.Empty;
+            if (value is IFormattable formattable)
+                return formattable.ToString(null, CultureInfo.InvariantCulture);
+            return value.ToString() ?? string.Empty;
+        }
+
         /// <summary>
         /// Finds a DataGrid from a ContextMenu's placement target.
         /// </summary>
         public static DataGrid? FindDataGridFromContextMenu(ContextMenu contextMenu)
         {
+            if (contextMenu.PlacementTarget is DataGrid grid)
+                return grid;
             if (contextMenu.PlacementTarget is DataGridRow row)
-            {
                 return FindParent<DataGrid>(row);
-            }
             return null;
         }
 
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 3afcf7e6..3b30f358 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -137,6 +137,10 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
         private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
+            // Sync CSV separator from preferences
+            var startupPrefs = _preferencesService.GetPreferences();
+            TabHelpers.CsvSeparator = startupPrefs.CsvSeparator;
+
             LoadServerList();
             InitializeNotificationService();
             OpenNocTab();
@@ -441,6 +445,17 @@ private void OpenServerTab(ServerConnection server)
 
             /* Set server UTC offset for chart axis bounds */
             var connStatus = _serverManager.GetConnectionStatus(server.Id);
+            if (!connStatus.UtcOffsetMinutes.HasValue)
+            {
+                /* Background check hasn't run yet — fetch offset synchronously so
+                   the first tab open doesn't default to local timezone. */
+                try
+                {
+                    _serverManager.CheckConnectionAsync(server.Id).GetAwaiter().GetResult();
+                    connStatus = _serverManager.GetConnectionStatus(server.Id);
+                }
+                catch { /* Fall through to local offset default */ }
+            }
             var utcOffset = connStatus.UtcOffsetMinutes ?? (int)TimeZoneInfo.Local.GetUtcOffset(DateTime.UtcNow).TotalMinutes;
             Helpers.ServerTimeHelper.UtcOffsetMinutes = utcOffset;
 
@@ -772,20 +787,34 @@ private void EditServer_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void RemoveServer_Click(object sender, RoutedEventArgs e)
+        private async void RemoveServer_Click(object sender, RoutedEventArgs e)
         {
             if (ServerListView.SelectedItem is ServerListItem item)
             {
                 var server = item.Server;
-                var result = MessageBox.Show(
-                    $"Are you sure you want to remove server '{server.DisplayName}'?\n\nThis action cannot be undone.",
-                    "Confirm Remove Server",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Warning
-                );
-
-                if (result == MessageBoxResult.Yes)
+                var dialog = new RemoveServerDialog(server.DisplayName);
+                dialog.Owner = this;
+
+                if (dialog.ShowDialog() == true)
                 {
+                    // Drop the database first if requested (before we delete credentials)
+                    if (dialog.DropDatabase)
+                    {
+                        try
+                        {
+                            await _serverManager.DropMonitorDatabaseAsync(server);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(
+                                $"Could not drop the PerformanceMonitor database on '{server.DisplayName}':\n\n{ex.Message}\n\nThe server will still be removed from the Dashboard.",
+                                "Database Drop Failed",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Warning
+                            );
+                        }
+                    }
+
                     if (_openTabs.TryGetValue(server.Id, out var tabItem))
                     {
                         _openTabs.Remove(server.Id);
diff --git a/Dashboard/ManageServersWindow.xaml b/Dashboard/ManageServersWindow.xaml
index 9c279c8c..d98aaf6e 100644
--- a/Dashboard/ManageServersWindow.xaml
+++ b/Dashboard/ManageServersWindow.xaml
@@ -8,6 +8,13 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+            <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+            <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+            <Separator/>
+            <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+        </ContextMenu>
     </Window.Resources>
     <Grid Margin="16">
         <Grid.RowDefinitions>
@@ -36,7 +43,8 @@
                       RowBackground="{DynamicResource BackgroundBrush}"
                       AlternatingRowBackground="{DynamicResource BackgroundLightBrush}"
                       BorderThickness="0"
-                      MouseDoubleClick="ServersDataGrid_MouseDoubleClick">
+                      MouseDoubleClick="ServersDataGrid_MouseDoubleClick"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
                     <DataGridTemplateColumn Header="" Width="30" CanUserSort="False">
                         <DataGridTemplateColumn.CellTemplate>
diff --git a/Dashboard/ManageServersWindow.xaml.cs b/Dashboard/ManageServersWindow.xaml.cs
index 4ce1eaf1..883a8354 100644
--- a/Dashboard/ManageServersWindow.xaml.cs
+++ b/Dashboard/ManageServersWindow.xaml.cs
@@ -7,7 +7,9 @@
  */
 
 using System;
+using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using PerformanceMonitorDashboard.Models;
 using PerformanceMonitorDashboard.Services;
@@ -139,19 +141,32 @@ private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void RemoveServer_Click(object sender, RoutedEventArgs e)
+        private async void RemoveServer_Click(object sender, RoutedEventArgs e)
         {
             if (ServersDataGrid.SelectedItem is ServerConnection server)
             {
-                var result = MessageBox.Show(
-                    $"Are you sure you want to remove server '{server.DisplayName}'?\n\nThis action cannot be undone.",
-                    "Confirm Remove Server",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Warning
-                );
+                var dialog = new RemoveServerDialog(server.DisplayName);
+                dialog.Owner = this;
 
-                if (result == MessageBoxResult.Yes)
+                if (dialog.ShowDialog() == true)
                 {
+                    if (dialog.DropDatabase)
+                    {
+                        try
+                        {
+                            await _serverManager.DropMonitorDatabaseAsync(server);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(
+                                $"Could not drop the PerformanceMonitor database on '{server.DisplayName}':\n\n{ex.Message}\n\nThe server will still be removed from the Dashboard.",
+                                "Database Drop Failed",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Warning
+                            );
+                        }
+                    }
+
                     _serverManager.DeleteServer(server.Id);
                     LoadServers();
                     ServersModified = true;
@@ -175,6 +190,80 @@ private void RemoveServer_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = Helpers.TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(Helpers.TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new System.Text.StringBuilder();
+                    var headers = new System.Collections.Generic.List<string>();
+                    foreach (var column in dataGrid.Columns)
+                        headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
+                    sb.AppendLine(string.Join("\t", headers));
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(Helpers.TabHelpers.GetRowAsText(dataGrid, item));
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = Helpers.TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var dialog = new Microsoft.Win32.SaveFileDialog
+                    {
+                        FileName = $"servers_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+                    if (dialog.ShowDialog() == true)
+                    {
+                        var sb = new System.Text.StringBuilder();
+                        var headers = new System.Collections.Generic.List<string>();
+                        foreach (var column in dataGrid.Columns)
+                            headers.Add(Helpers.TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
+                        sb.AppendLine(string.Join(",", headers));
+                        foreach (var item in dataGrid.Items)
+                        {
+                            var values = Helpers.TabHelpers.GetRowValues(dataGrid, item);
+                            sb.AppendLine(string.Join(",", values.Select(v => Helpers.TabHelpers.EscapeCsvField(v))));
+                        }
+                        System.IO.File.WriteAllText(dialog.FileName, sb.ToString());
+                    }
+                }
+            }
+        }
+
         private void Close_Click(object sender, RoutedEventArgs e)
         {
             DialogResult = ServersModified;
diff --git a/Dashboard/Mcp/McpMemoryTools.cs b/Dashboard/Mcp/McpMemoryTools.cs
index 2f64333e..c04cb0e9 100644
--- a/Dashboard/Mcp/McpMemoryTools.cs
+++ b/Dashboard/Mcp/McpMemoryTools.cs
@@ -199,12 +199,9 @@ public static async Task<string> GetMemoryGrants(
                 waiter_count = r.WaiterCount,
                 timeout_error_count = r.TimeoutErrorCount,
                 forced_grant_count = r.ForcedGrantCount,
-                granted_pct = r.GrantedPercentage,
-                used_pct = r.UsedPercentage,
-                available_memory_pressure = r.AvailableMemoryPressureWarning,
-                waiter_count_warning = r.WaiterCountWarning,
-                timeout_error_warning = r.TimeoutErrorWarning,
-                forced_grant_warning = r.ForcedGrantWarning
+                timeout_error_count_delta = r.TimeoutErrorCountDelta,
+                forced_grant_count_delta = r.ForcedGrantCountDelta,
+                sample_interval_seconds = r.SampleIntervalSeconds
             });
 
             return JsonSerializer.Serialize(new
diff --git a/Dashboard/Models/BlockedSessionTrendItem.cs b/Dashboard/Models/BlockedSessionTrendItem.cs
new file mode 100644
index 00000000..3ef85634
--- /dev/null
+++ b/Dashboard/Models/BlockedSessionTrendItem.cs
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class BlockedSessionTrendItem
+    {
+        public DateTime CollectionTime { get; set; }
+        public string DatabaseName { get; set; } = string.Empty;
+        public int BlockedCount { get; set; }
+    }
+}
diff --git a/Dashboard/Models/FileIoLatencyTimeSeriesItem.cs b/Dashboard/Models/FileIoLatencyTimeSeriesItem.cs
index 62828332..982c2350 100644
--- a/Dashboard/Models/FileIoLatencyTimeSeriesItem.cs
+++ b/Dashboard/Models/FileIoLatencyTimeSeriesItem.cs
@@ -20,5 +20,9 @@ public class FileIoLatencyTimeSeriesItem
         public decimal WriteLatencyMs { get; set; }
         public long ReadCount { get; set; }
         public long WriteCount { get; set; }
+        public decimal ReadQueuedLatencyMs { get; set; }
+        public decimal WriteQueuedLatencyMs { get; set; }
+        public decimal ReadThroughputMbPerSec { get; set; }
+        public decimal WriteThroughputMbPerSec { get; set; }
     }
 }
diff --git a/Dashboard/Models/LiveQueryItem.cs b/Dashboard/Models/LiveQueryItem.cs
new file mode 100644
index 00000000..935a9d03
--- /dev/null
+++ b/Dashboard/Models/LiveQueryItem.cs
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class LiveQueryItem
+    {
+        public DateTime SnapshotTime { get; set; }
+        public int SessionId { get; set; }
+        public string? DatabaseName { get; set; }
+        public string ElapsedTimeFormatted { get; set; } = string.Empty;
+        public string? QueryText { get; set; }
+        public string? QueryPlan { get; set; }
+        public string? LiveQueryPlan { get; set; }
+        public string? Status { get; set; }
+        public int BlockingSessionId { get; set; }
+        public string? WaitType { get; set; }
+        public long WaitTimeMs { get; set; }
+        public string? WaitResource { get; set; }
+        public long CpuTimeMs { get; set; }
+        public long TotalElapsedTimeMs { get; set; }
+        public long Reads { get; set; }
+        public long Writes { get; set; }
+        public long LogicalReads { get; set; }
+        public decimal GrantedQueryMemoryGb { get; set; }
+        public string? TransactionIsolationLevel { get; set; }
+        public int Dop { get; set; }
+        public int ParallelWorkerCount { get; set; }
+        public string? LoginName { get; set; }
+        public string? HostName { get; set; }
+        public string? ProgramName { get; set; }
+        public int OpenTransactionCount { get; set; }
+        public decimal PercentComplete { get; set; }
+
+        public bool HasQueryPlan => !string.IsNullOrEmpty(QueryPlan);
+        public bool HasLiveQueryPlan => !string.IsNullOrEmpty(LiveQueryPlan);
+    }
+}
diff --git a/Dashboard/Models/MemoryGrantStatsItem.cs b/Dashboard/Models/MemoryGrantStatsItem.cs
index 177f2b4a..eaf9ccb2 100644
--- a/Dashboard/Models/MemoryGrantStatsItem.cs
+++ b/Dashboard/Models/MemoryGrantStatsItem.cs
@@ -6,6 +6,7 @@ public class MemoryGrantStatsItem
     {
         public long CollectionId { get; set; }
         public DateTime CollectionTime { get; set; }
+        public DateTime ServerStartTime { get; set; }
         public short ResourceSemaphoreId { get; set; }
         public int PoolId { get; set; }
 
@@ -17,24 +18,15 @@ public class MemoryGrantStatsItem
         public decimal? GrantedMemoryMb { get; set; }
         public decimal? UsedMemoryMb { get; set; }
 
-        // Counts
+        // Point-in-time counts
         public int? GranteeCount { get; set; }
         public int? WaiterCount { get; set; }
         public long? TimeoutErrorCount { get; set; }
         public long? ForcedGrantCount { get; set; }
 
-        // Pressure warnings
-        public bool? AvailableMemoryPressureWarning { get; set; }
-        public bool? WaiterCountWarning { get; set; }
-        public bool? TimeoutErrorWarning { get; set; }
-        public bool? ForcedGrantWarning { get; set; }
-
-        // Computed helpers
-        public decimal? GrantedPercentage => TargetMemoryMb > 0
-            ? GrantedMemoryMb * 100.0m / TargetMemoryMb
-            : null;
-        public decimal? UsedPercentage => GrantedMemoryMb > 0
-            ? UsedMemoryMb * 100.0m / GrantedMemoryMb
-            : null;
+        // Delta columns (calculated by framework)
+        public long? TimeoutErrorCountDelta { get; set; }
+        public long? ForcedGrantCountDelta { get; set; }
+        public int? SampleIntervalSeconds { get; set; }
     }
 }
diff --git a/Dashboard/Models/PlanModels.cs b/Dashboard/Models/PlanModels.cs
new file mode 100644
index 00000000..c6a6f87e
--- /dev/null
+++ b/Dashboard/Models/PlanModels.cs
@@ -0,0 +1,515 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PerformanceMonitorDashboard.Models;
+
+public class ParsedPlan
+{
+    public string RawXml { get; set; } = "";
+    public string? BuildVersion { get; set; }
+    public string? Build { get; set; }
+    public bool ClusteredMode { get; set; }
+    public List<PlanBatch> Batches { get; set; } = new();
+
+    public List<MissingIndex> AllMissingIndexes => Batches
+        .SelectMany(b => b.Statements)
+        .SelectMany(s => s.MissingIndexes)
+        .ToList();
+}
+
+public class PlanBatch
+{
+    public List<PlanStatement> Statements { get; set; } = new();
+}
+
+public class PlanStatement
+{
+    public string StatementText { get; set; } = "";
+    public string StatementType { get; set; } = "";
+    public double StatementSubTreeCost { get; set; }
+    public double StatementEstRows { get; set; }
+    public PlanNode? RootNode { get; set; }
+    public List<MissingIndex> MissingIndexes { get; set; } = new();
+    public MemoryGrantInfo? MemoryGrant { get; set; }
+
+    // Statement-level metadata
+    public int CardinalityEstimationModelVersion { get; set; }
+    public long CompileTimeMs { get; set; }
+    public long CompileMemoryKB { get; set; }
+    public long CompileCPUMs { get; set; }
+    public string? NonParallelPlanReason { get; set; }
+    public string? QueryHash { get; set; }
+    public string? QueryPlanHash { get; set; }
+    public long CachedPlanSizeKB { get; set; }
+    public int DegreeOfParallelism { get; set; }
+    public bool RetrievedFromCache { get; set; }
+
+    // Additional StmtSimple attributes
+    public string? StatementOptmLevel { get; set; }
+    public string? StatementOptmEarlyAbortReason { get; set; }
+    public int StatementParameterizationType { get; set; }
+    public string? StatementSqlHandle { get; set; }
+    public long DatabaseContextSettingsId { get; set; }
+    public int ParentObjectId { get; set; }
+    public bool SecurityPolicyApplied { get; set; }
+    public bool BatchModeOnRowStoreUsed { get; set; }
+
+    // QueryPlan sub-elements
+    public OptimizerHardwareInfo? HardwareProperties { get; set; }
+    public List<OptimizerStatsUsageItem> StatsUsage { get; set; } = new();
+    public ThreadStatInfo? ThreadStats { get; set; }
+    public SetOptionsInfo? SetOptions { get; set; }
+    public List<PlanParameter> Parameters { get; set; } = new();
+    public List<WaitStatInfo> WaitStats { get; set; } = new();
+    public QueryTimeInfo? QueryTimeStats { get; set; }
+
+    // Wave 2: MaxQueryMemory + QueryPlan-level warnings
+    public long MaxQueryMemoryKB { get; set; }
+    public List<PlanWarning> PlanWarnings { get; set; } = new();
+
+    // Wave 3: DOP feedback, plan guide, parameterized text, QS hints, trace flags, indexed views
+    public int EffectiveDOP { get; set; }
+    public string? DOPFeedbackAdjusted { get; set; }
+    public string? PlanGuideDB { get; set; }
+    public string? PlanGuideName { get; set; }
+    public bool UsePlan { get; set; }
+    public string? ParameterizedText { get; set; }
+    public int QueryStoreStatementHintId { get; set; }
+    public string? QueryStoreStatementHintText { get; set; }
+    public string? QueryStoreStatementHintSource { get; set; }
+    public List<TraceFlagInfo> TraceFlags { get; set; } = new();
+    public List<string> IndexedViews { get; set; } = new();
+
+    // Wave 4: Cursor plan metadata
+    public string? CursorName { get; set; }
+    public string? CursorActualType { get; set; }
+    public string? CursorRequestedType { get; set; }
+    public string? CursorConcurrency { get; set; }
+    public bool CursorForwardOnly { get; set; }
+
+    // XSD gap: Statement-level identifiers
+    public int StatementId { get; set; }
+    public int StatementCompId { get; set; }
+
+    // XSD gap: Template plan guide
+    public string? TemplatePlanGuideDB { get; set; }
+    public string? TemplatePlanGuideName { get; set; }
+
+    // XSD gap: Handle attributes
+    public string? ParameterizedPlanHandle { get; set; }
+    public string? BatchSqlHandle { get; set; }
+
+    // XSD gap: Feature flags
+    public bool ContainsLedgerTables { get; set; }
+    public bool ContainsInterleavedExecutionCandidates { get; set; }
+    public bool ContainsInlineScalarTsqlUdfs { get; set; }
+
+    // XSD gap: QueryPlan metadata
+    public int QueryVariantID { get; set; }
+    public string? DispatcherPlanHandle { get; set; }
+    public bool ExclusiveProfileTimeActive { get; set; }
+    public string? OptimizationReplayScript { get; set; }
+
+    // XSD gap: BaseStmtInfoType
+    public int QueryCompilationReplay { get; set; }
+
+    // XSD gap: QueryTimeStats UDF totals (statement-level, separate from per-node)
+    public long QueryUdfCpuTimeMs { get; set; }
+    public long QueryUdfElapsedTimeMs { get; set; }
+
+    // XSD gap: CardinalityFeedback
+    public List<CardinalityFeedbackEntry> CardinalityFeedback { get; set; } = new();
+
+    // XSD gap: Dispatcher/PSP
+    public DispatcherInfo? Dispatcher { get; set; }
+
+    // XSD gap: UDF/StoredProc sub-plans
+    public List<FunctionPlanInfo> UdfPlans { get; set; } = new();
+    public FunctionPlanInfo? StoredProcPlan { get; set; }
+}
+
+public class PlanNode
+{
+    // Identity
+    public int NodeId { get; set; }
+    public string PhysicalOp { get; set; } = "";
+    public string LogicalOp { get; set; } = "";
+
+    // Cost metrics
+    public double EstimatedTotalSubtreeCost { get; set; }
+    public double EstimatedOperatorCost { get; set; }
+    public double EstimateRows { get; set; }
+    public double EstimateIO { get; set; }
+    public double EstimateCPU { get; set; }
+    public double EstimateRebinds { get; set; }
+    public double EstimateRewinds { get; set; }
+    public int EstimatedRowSize { get; set; }
+
+    // Actual runtime stats (0 if estimated plan only)
+    public long ActualRows { get; set; }
+    public long ActualExecutions { get; set; }
+    public long ActualRowsRead { get; set; }
+    public long ActualRebinds { get; set; }
+    public long ActualRewinds { get; set; }
+    public long ActualElapsedMs { get; set; }
+    public long ActualCPUMs { get; set; }
+    public long ActualLogicalReads { get; set; }
+    public long ActualPhysicalReads { get; set; }
+    public bool HasActualStats { get; set; }
+
+    // Parallelism
+    public bool Parallel { get; set; }
+    public int EstimatedDOP { get; set; }
+    public string? ExecutionMode { get; set; }
+
+    // Display
+    public string IconName { get; set; } = "iterator_catch_all";
+    public int CostPercent { get; set; }
+    public bool IsExpensive => CostPercent >= 25;
+
+    // Detail properties (for tooltip/properties panel)
+    public string? DatabaseName { get; set; }
+    public string? ObjectName { get; set; }
+    public string? FullObjectName { get; set; }
+    public string? IndexName { get; set; }
+    public string? SeekPredicates { get; set; }
+    public string? Predicate { get; set; }
+    public string? HashKeysProbe { get; set; }
+    public string? HashKeysBuild { get; set; }
+    public string? BuildResidual { get; set; }
+    public string? ProbeResidual { get; set; }
+    public string? OutputColumns { get; set; }
+    public bool Ordered { get; set; }
+    public string? PartitioningType { get; set; }
+    public string? StorageType { get; set; }
+
+    // RelOp-level properties (from <RelOp> element per XSD)
+    public bool Partitioned { get; set; }
+    public bool IsAdaptive { get; set; }
+    public double AdaptiveThresholdRows { get; set; }
+    public string? EstimatedJoinType { get; set; }
+    public string? ActualJoinType { get; set; }
+    public string? ActualExecutionMode { get; set; }
+
+    // Scan/Seek properties (IndexScanType / TableScanType)
+    public string? ScanDirection { get; set; }
+    public bool ForcedIndex { get; set; }
+    public bool ForceScan { get; set; }
+    public bool ForceSeek { get; set; }
+    public bool NoExpandHint { get; set; }
+    public bool Lookup { get; set; }
+    public bool DynamicSeek { get; set; }
+
+    // Operator-specific properties
+    public string? OrderBy { get; set; }
+    public string? OuterReferences { get; set; }
+    public string? InnerSideJoinColumns { get; set; }
+    public string? OuterSideJoinColumns { get; set; }
+    public string? GroupBy { get; set; }
+    public string? PartitionColumns { get; set; }
+    public string? DefinedValues { get; set; }
+    public double TableCardinality { get; set; }
+    public double EstimatedRowsRead { get; set; }
+    public string? TopExpression { get; set; }
+    public bool IsPercent { get; set; }
+    public bool WithTies { get; set; }
+    public bool ManyToMany { get; set; }
+    public bool BitmapCreator { get; set; }
+    public string? SetPredicate { get; set; }
+    public string? SegmentColumn { get; set; }
+    public bool SortDistinct { get; set; }
+    public bool StartupExpression { get; set; }
+
+    // Nested Loops properties
+    public bool NLOptimized { get; set; }
+    public bool WithOrderedPrefetch { get; set; }
+    public bool WithUnorderedPrefetch { get; set; }
+
+    // Parallelism properties
+    public bool Remoting { get; set; }
+    public bool LocalParallelism { get; set; }
+
+    // Extended actual I/O stats
+    public long ActualScans { get; set; }
+    public long ActualReadAheads { get; set; }
+    public long ActualLobLogicalReads { get; set; }
+    public long ActualLobPhysicalReads { get; set; }
+    public long ActualLobReadAheads { get; set; }
+
+    // Memory
+    public long? MemoryGrantKB { get; set; }
+    public long? DesiredMemoryKB { get; set; }
+    public long? MaxUsedMemoryKB { get; set; }
+
+    // Warnings
+    public List<PlanWarning> Warnings { get; set; } = new();
+    public bool HasWarnings => Warnings.Count > 0;
+
+    // Tree structure
+    public List<PlanNode> Children { get; set; } = new();
+    public PlanNode? Parent { get; set; }
+
+    // Layout coordinates (set by layout engine)
+    public double X { get; set; }
+    public double Y { get; set; }
+
+    // Wave 2: Merge/NL residual + pass-thru, parallelism hash keys, Top extras
+    public string? MergeResidual { get; set; }
+    public string? PassThru { get; set; }
+    public string? HashKeys { get; set; }
+    public string? OffsetExpression { get; set; }
+    public bool RowCount { get; set; }
+    public int TopRows { get; set; }
+
+    // Wave 3: MemoryFractions, RunTimePartitionSummary, Spool, Update DML, Columnstore, UDF
+    public double MemoryFractionInput { get; set; }
+    public double MemoryFractionOutput { get; set; }
+    public int PartitionsAccessed { get; set; }
+    public string? PartitionRanges { get; set; }
+    public bool SpoolStack { get; set; }
+    public int PrimaryNodeId { get; set; }
+    public bool DMLRequestSort { get; set; }
+    public string? ActionColumn { get; set; }
+    public long ActualSegmentReads { get; set; }
+    public long ActualSegmentSkips { get; set; }
+    public long UdfCpuTimeUs { get; set; }
+    public long UdfElapsedTimeUs { get; set; }
+
+    // XSD gap: RelOp-level metadata
+    public bool GroupExecuted { get; set; }
+    public bool RemoteDataAccess { get; set; }
+    public bool OptimizedHalloweenProtectionUsed { get; set; }
+    public long StatsCollectionId { get; set; }
+
+    // XSD gap: Object metadata
+    public string? ServerName { get; set; }
+    public string? ObjectAlias { get; set; }
+    public string? IndexKind { get; set; }
+    public bool FilteredIndex { get; set; }
+    public int TableReferenceId { get; set; }
+
+    // XSD gap: Per-thread runtime data
+    public List<PerThreadRuntimeInfo> PerThreadStats { get; set; } = new();
+
+    // XSD gap: Operator-level properties
+    public int ForceSeekColumnCount { get; set; }
+    public string? PartitionId { get; set; }
+    public bool IsStarJoin { get; set; }
+    public string? StarJoinOperationType { get; set; }
+    public string? ProbeColumn { get; set; }
+    public bool InRow { get; set; }
+    public bool ComputeSequence { get; set; }
+    public int RollupHighestLevel { get; set; }
+    public List<int> RollupLevels { get; set; } = new();
+    public string? TvfParameters { get; set; }
+    public string? OriginalActionColumn { get; set; }
+    public List<ScalarUdfReference> ScalarUdfs { get; set; } = new();
+    public string? TieColumns { get; set; }
+    public string? UdxName { get; set; }
+    public List<string> OperatorIndexedViews { get; set; } = new();
+    public List<NamedParameterInfo> NamedParameters { get; set; } = new();
+
+    // Eager spool index suggestion
+    public string? SuggestedIndex { get; set; }
+
+    // Remote operator metadata
+    public string? RemoteDestination { get; set; }
+    public string? RemoteSource { get; set; }
+    public string? RemoteObject { get; set; }
+    public string? RemoteQuery { get; set; }
+}
+
+public class MissingIndex
+{
+    public string Database { get; set; } = "";
+    public string Schema { get; set; } = "";
+    public string Table { get; set; } = "";
+    public double Impact { get; set; }
+    public List<string> EqualityColumns { get; set; } = new();
+    public List<string> InequalityColumns { get; set; } = new();
+    public List<string> IncludeColumns { get; set; } = new();
+    public string CreateStatement { get; set; } = "";
+}
+
+public class PlanWarning
+{
+    public string WarningType { get; set; } = "";
+    public string Message { get; set; } = "";
+    public PlanWarningSeverity Severity { get; set; }
+    public SpillDetail? SpillDetails { get; set; }
+}
+
+public enum PlanWarningSeverity { Info, Warning, Critical }
+
+public class MemoryGrantInfo
+{
+    public long SerialRequiredMemoryKB { get; set; }
+    public long SerialDesiredMemoryKB { get; set; }
+    public long RequiredMemoryKB { get; set; }
+    public long DesiredMemoryKB { get; set; }
+    public long RequestedMemoryKB { get; set; }
+    public long GrantedMemoryKB { get; set; }
+    public long MaxUsedMemoryKB { get; set; }
+    public long GrantWaitTimeMs { get; set; }
+    public long LastRequestedMemoryKB { get; set; }
+    public string? IsMemoryGrantFeedbackAdjusted { get; set; }
+}
+
+public class OptimizerHardwareInfo
+{
+    public long EstimatedAvailableMemoryGrant { get; set; }
+    public long EstimatedPagesCached { get; set; }
+    public int EstimatedAvailableDOP { get; set; }
+    public long MaxCompileMemory { get; set; }
+}
+
+public class OptimizerStatsUsageItem
+{
+    public string StatisticsName { get; set; } = "";
+    public string TableName { get; set; } = "";
+    public string? DatabaseName { get; set; }
+    public string? SchemaName { get; set; }
+    public long ModificationCount { get; set; }
+    public double SamplingPercent { get; set; }
+    public string? LastUpdate { get; set; }
+}
+
+public class ThreadStatInfo
+{
+    public int Branches { get; set; }
+    public int UsedThreads { get; set; }
+    public List<ThreadReservation> Reservations { get; set; } = new();
+}
+
+public class SetOptionsInfo
+{
+    public bool AnsiNulls { get; set; }
+    public bool AnsiPadding { get; set; }
+    public bool AnsiWarnings { get; set; }
+    public bool ArithAbort { get; set; }
+    public bool ConcatNullYieldsNull { get; set; }
+    public bool NumericRoundAbort { get; set; }
+    public bool QuotedIdentifier { get; set; }
+}
+
+public class PlanParameter
+{
+    public string Name { get; set; } = "";
+    public string DataType { get; set; } = "";
+    public string? CompiledValue { get; set; }
+    public string? RuntimeValue { get; set; }
+}
+
+public class WaitStatInfo
+{
+    public string WaitType { get; set; } = "";
+    public long WaitTimeMs { get; set; }
+    public long WaitCount { get; set; }
+}
+
+public class QueryTimeInfo
+{
+    public long CpuTimeMs { get; set; }
+    public long ElapsedTimeMs { get; set; }
+}
+
+public class TraceFlagInfo
+{
+    public int Value { get; set; }
+    public string Scope { get; set; } = "";
+    public bool IsCompileTime { get; set; }
+}
+
+public class CardinalityFeedbackEntry
+{
+    public long Key { get; set; }
+    public long Value { get; set; }
+}
+
+public class ThreadReservation
+{
+    public int NodeId { get; set; }
+    public int ReservedThreads { get; set; }
+}
+
+public class DispatcherInfo
+{
+    public List<ParameterSensitivePredicateInfo> ParameterSensitivePredicates { get; set; } = new();
+    public List<OptionalParameterPredicateInfo> OptionalParameterPredicates { get; set; } = new();
+}
+
+public class OptionalParameterPredicateInfo
+{
+    public string? PredicateText { get; set; }
+}
+
+public class ParameterSensitivePredicateInfo
+{
+    public double LowBoundary { get; set; }
+    public double HighBoundary { get; set; }
+    public string? PredicateText { get; set; }
+    public List<OptimizerStatsUsageItem> Statistics { get; set; } = new();
+}
+
+public class FunctionPlanInfo
+{
+    public string ProcName { get; set; } = "";
+    public bool IsNativelyCompiled { get; set; }
+    public List<PlanStatement> Statements { get; set; } = new();
+}
+
+public class PerThreadRuntimeInfo
+{
+    public int ThreadId { get; set; }
+    public long ActualRows { get; set; }
+    public long ActualExecutions { get; set; }
+    public long ActualElapsedMs { get; set; }
+    public long ActualCPUMs { get; set; }
+    public long ActualRowsRead { get; set; }
+    public long ActualLogicalReads { get; set; }
+    public long ActualPhysicalReads { get; set; }
+    public long ActualScans { get; set; }
+    public long ActualReadAheads { get; set; }
+    // Timing metadata
+    public long FirstActiveTime { get; set; }
+    public long LastActiveTime { get; set; }
+    public long OpenTime { get; set; }
+    public long FirstRowTime { get; set; }
+    public long LastRowTime { get; set; }
+    public long CloseTime { get; set; }
+    // Per-thread memory
+    public long InputMemoryGrant { get; set; }
+    public long OutputMemoryGrant { get; set; }
+    public long UsedMemoryGrant { get; set; }
+    // Batch mode
+    public long Batches { get; set; }
+    public long ActualEndOfScans { get; set; }
+    // Other
+    public long ActualLocallyAggregatedRows { get; set; }
+    public bool IsInterleavedExecuted { get; set; }
+    public long RowRequalifications { get; set; }
+}
+
+public class SpillDetail
+{
+    public string SpillType { get; set; } = ""; // "Sort", "Hash", "Exchange"
+    public long GrantedMemoryKB { get; set; }
+    public long UsedMemoryKB { get; set; }
+    public long WritesToTempDb { get; set; }
+    public long ReadsFromTempDb { get; set; }
+}
+
+public class ScalarUdfReference
+{
+    public string FunctionName { get; set; } = "";
+    public bool IsClrFunction { get; set; }
+    public string? ClrAssembly { get; set; }
+    public string? ClrClass { get; set; }
+    public string? ClrMethod { get; set; }
+}
+
+public class NamedParameterInfo
+{
+    public string Name { get; set; } = "";
+    public string? ScalarString { get; set; }
+}
diff --git a/Dashboard/Models/ProcedureExecutionHistoryItem.cs b/Dashboard/Models/ProcedureExecutionHistoryItem.cs
index 0a67c175..fb2af2c0 100644
--- a/Dashboard/Models/ProcedureExecutionHistoryItem.cs
+++ b/Dashboard/Models/ProcedureExecutionHistoryItem.cs
@@ -22,6 +22,7 @@ public class ProcedureExecutionHistoryItem
 
         // Cumulative values
         public long ExecutionCount { get; set; }
+        public long IntervalExecutions { get; set; }
         public long TotalWorkerTime { get; set; }
         public long MinWorkerTime { get; set; }
         public long MaxWorkerTime { get; set; }
@@ -41,6 +42,10 @@ public class ProcedureExecutionHistoryItem
         public long? MinSpills { get; set; }
         public long? MaxSpills { get; set; }
 
+        // Query identifiers (hex strings from binary columns)
+        public string? SqlHandle { get; set; }
+        public string? PlanHandle { get; set; }
+
         // Delta values
         public long? ExecutionCountDelta { get; set; }
         public long? TotalWorkerTimeDelta { get; set; }
diff --git a/Dashboard/Models/QueryExecutionHistoryItem.cs b/Dashboard/Models/QueryExecutionHistoryItem.cs
index a763b471..7ec60337 100644
--- a/Dashboard/Models/QueryExecutionHistoryItem.cs
+++ b/Dashboard/Models/QueryExecutionHistoryItem.cs
@@ -61,6 +61,10 @@ public class QueryExecutionHistoryItem
         public long? MinTempdbSpaceUsed { get; set; }
         public long? MaxTempdbSpaceUsed { get; set; }
 
+        // Query identifiers (hex strings from binary columns)
+        public string? QueryHash { get; set; }
+        public string? QueryPlanHash { get; set; }
+
         // Plan info
         public string? PlanType { get; set; }
         public bool IsForcedPlan { get; set; }
diff --git a/Dashboard/Models/QueryStatsHistoryItem.cs b/Dashboard/Models/QueryStatsHistoryItem.cs
index 25c257ba..d05ec525 100644
--- a/Dashboard/Models/QueryStatsHistoryItem.cs
+++ b/Dashboard/Models/QueryStatsHistoryItem.cs
@@ -22,6 +22,7 @@ public class QueryStatsHistoryItem
         // Execution count
         public long ExecutionCount { get; set; }
         public long? ExecutionCountDelta { get; set; }
+        public long IntervalExecutions { get; set; }
 
         // Worker time (CPU) - microseconds in database
         public long TotalWorkerTime { get; set; }
@@ -80,6 +81,12 @@ public class QueryStatsHistoryItem
         public long MinSpills { get; set; }
         public long MaxSpills { get; set; }
 
+        // Query identifiers (hex strings from binary columns)
+        public string? SqlHandle { get; set; }
+        public string? PlanHandle { get; set; }
+        public string? QueryHash { get; set; }
+        public string? QueryPlanHash { get; set; }
+
         // Sample interval
         public int? SampleIntervalSeconds { get; set; }
 
diff --git a/Dashboard/Models/QueryStatsItem.cs b/Dashboard/Models/QueryStatsItem.cs
index 3f9c77cd..9ab5de1c 100644
--- a/Dashboard/Models/QueryStatsItem.cs
+++ b/Dashboard/Models/QueryStatsItem.cs
@@ -34,6 +34,8 @@ public class QueryStatsItem
         public long? AvgLogicalReads { get; set; }
         public long? AvgLogicalWrites { get; set; }
         public long? AvgPhysicalReads { get; set; }
+        public long? MinPhysicalReads { get; set; }
+        public long? MaxPhysicalReads { get; set; }
         public long? AvgRows { get; set; }
         public long? MinRows { get; set; }
         public long? MaxRows { get; set; }
diff --git a/Dashboard/Models/QueryStoreItem.cs b/Dashboard/Models/QueryStoreItem.cs
index ad6a1ce1..4f12ab66 100644
--- a/Dashboard/Models/QueryStoreItem.cs
+++ b/Dashboard/Models/QueryStoreItem.cs
@@ -64,6 +64,23 @@ public class QueryStoreItem
         public bool IsForcedPlan { get; set; }
         public short? CompatibilityLevel { get; set; }
 
+        // Plan forcing details
+        public long? ForceFailureCount { get; set; }
+        public string? LastForceFailureReasonDesc { get; set; }
+        public string? PlanForcingType { get; set; }
+
+        // CLR time (pre-calculated in ms)
+        public double? MinClrTimeMs { get; set; }
+        public double? MaxClrTimeMs { get; set; }
+
+        // Physical IO reads (memory-optimized tables, SQL 2017+)
+        public long? MinNumPhysicalIoReads { get; set; }
+        public long? MaxNumPhysicalIoReads { get; set; }
+
+        // Log bytes used (SQL 2017+)
+        public long? MinLogBytesUsed { get; set; }
+        public long? MaxLogBytesUsed { get; set; }
+
         // Handle
         public string? QueryPlanHash { get; set; }
 
@@ -73,10 +90,12 @@ public class QueryStoreItem
 
         // Display helpers - memory in MB (8KB pages * 8 / 1024)
         public double? AvgMemoryMb => AvgMemoryPages.HasValue ? AvgMemoryPages.Value * 8.0 / 1024.0 : null;
+        public double? MinMemoryMb => MinMemoryPages.HasValue ? MinMemoryPages.Value * 8.0 / 1024.0 : null;
         public double? MaxMemoryMb => MaxMemoryPages.HasValue ? MaxMemoryPages.Value * 8.0 / 1024.0 : null;
 
         // Tempdb in MB
         public double? AvgTempdbMb => AvgTempdbPages.HasValue ? AvgTempdbPages.Value * 8.0 / 1024.0 : null;
+        public double? MinTempdbMb => MinTempdbPages.HasValue ? MinTempdbPages.Value * 8.0 / 1024.0 : null;
         public double? MaxTempdbMb => MaxTempdbPages.HasValue ? MaxTempdbPages.Value * 8.0 / 1024.0 : null;
 
         // Property aliases for XAML binding compatibility
diff --git a/Dashboard/Models/QueryStoreRegressionItem.cs b/Dashboard/Models/QueryStoreRegressionItem.cs
index 1296e664..be76a2dc 100644
--- a/Dashboard/Models/QueryStoreRegressionItem.cs
+++ b/Dashboard/Models/QueryStoreRegressionItem.cs
@@ -18,8 +18,14 @@ public class QueryStoreRegressionItem
         public decimal BaselineReads { get; set; }
         public decimal RecentReads { get; set; }
         public decimal IoRegressionPercent { get; set; }
+        public decimal AdditionalDurationMs { get; set; }
+        public long BaselineExecCount { get; set; }
+        public long RecentExecCount { get; set; }
+        public int BaselinePlanCount { get; set; }
+        public int RecentPlanCount { get; set; }
         public string Severity { get; set; } = string.Empty;
         public string QueryTextSample { get; set; } = string.Empty;
         public DateTime? LastExecutionTime { get; set; }
+        public string? QueryPlanXml { get; set; }
     }
 }
diff --git a/Dashboard/Models/TracePatternDetailItem.cs b/Dashboard/Models/TracePatternDetailItem.cs
new file mode 100644
index 00000000..9d81c0d1
--- /dev/null
+++ b/Dashboard/Models/TracePatternDetailItem.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2025 Darling Data, LLC
+// Licensed under the MIT License
+
+using System;
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class TracePatternDetailItem
+    {
+        public long AnalysisId { get; set; }
+        public DateTime CollectionTime { get; set; }
+        public string EventName { get; set; } = string.Empty;
+        public string? DatabaseName { get; set; }
+        public string? LoginName { get; set; }
+        public string? ApplicationName { get; set; }
+        public string? HostName { get; set; }
+        public int? Spid { get; set; }
+        public long? DurationMs { get; set; }
+        public long? CpuMs { get; set; }
+        public long? Reads { get; set; }
+        public long? Writes { get; set; }
+        public long? RowCounts { get; set; }
+        public DateTime? StartTime { get; set; }
+        public DateTime? EndTime { get; set; }
+        public string? SqlText { get; set; }
+        public long? ObjectId { get; set; }
+    }
+}
diff --git a/Dashboard/Models/UserPreferences.cs b/Dashboard/Models/UserPreferences.cs
index 24ea603d..37e48e6c 100644
--- a/Dashboard/Models/UserPreferences.cs
+++ b/Dashboard/Models/UserPreferences.cs
@@ -100,6 +100,14 @@ public class UserPreferences
         public bool McpEnabled { get; set; } = false;
         public int McpPort { get; set; } = 5150;
 
+        // CSV export settings
+        public string CsvSeparator { get; set; } = GetDefaultCsvSeparator();
+
+        private static string GetDefaultCsvSeparator()
+        {
+            return System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == "," ? ";" : ",";
+        }
+
         // Navigation settings
         public bool FocusServerTabOnClick { get; set; } = true;
 
diff --git a/Dashboard/Models/WaitingTaskTrendItem.cs b/Dashboard/Models/WaitingTaskTrendItem.cs
new file mode 100644
index 00000000..5869e4d2
--- /dev/null
+++ b/Dashboard/Models/WaitingTaskTrendItem.cs
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+
+namespace PerformanceMonitorDashboard.Models
+{
+    public class WaitingTaskTrendItem
+    {
+        public DateTime CollectionTime { get; set; }
+        public string WaitType { get; set; } = string.Empty;
+        public long TotalWaitMs { get; set; }
+    }
+}
diff --git a/Dashboard/ProcedureHistoryWindow.xaml b/Dashboard/ProcedureHistoryWindow.xaml
index 613b308b..972006f1 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml
+++ b/Dashboard/ProcedureHistoryWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:converters="clr-namespace:PerformanceMonitorDashboard.Converters"
         xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
-        Title="Procedure Execution History" Height="900" Width="1400"
+        Title="Procedure Execution History" Height="900" Width="1600"
         WindowStartupLocation="CenterOwner"
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
@@ -31,8 +31,8 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="2*" MinHeight="250"/>
-            <RowDefinition Height="3*"/>
+            <RowDefinition Height="3*" MinHeight="300"/>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
@@ -62,7 +62,7 @@
                         <ComboBoxItem Content="Avg Logical Writes" Tag="AvgLogicalWrites"/>
                         <ComboBoxItem Content="Avg Physical Reads" Tag="AvgPhysicalReads"/>
                         <ComboBoxItem Content="Avg Spills" Tag="AvgSpills"/>
-                        <ComboBoxItem Content="Execution Count Delta" Tag="ExecutionCountDelta"/>
+                        <ComboBoxItem Content="Executions Per Interval" Tag="IntervalExecutions"/>
                     </ComboBox>
                 </StackPanel>
 
@@ -127,16 +127,16 @@
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
 
-                <!-- Execution Count -->
-                <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90">
+                <!-- Execution Count (per-interval, computed from cumulative counter) -->
+                <DataGridTextColumn Binding="{Binding IntervalExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
-                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IntervalExecutions" Click="Filter_Click" Margin="0,0,4,0"/>
                             <TextBlock Text="Exec Count" FontWeight="Bold" VerticalAlignment="Center"/>
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding ExecutionCountDelta, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding ExecutionCountDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCountDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -146,7 +146,7 @@
                 </DataGridTextColumn>
 
                 <!-- Worker Time (CPU) -->
-                <DataGridTextColumn Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" Width="110">
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="110">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -154,7 +154,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -162,7 +162,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -170,7 +170,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -178,7 +178,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" Width="105">
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="105">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -188,7 +188,7 @@
                 </DataGridTextColumn>
 
                 <!-- Elapsed Time -->
-                <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -196,7 +196,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -204,7 +204,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -212,7 +212,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -220,7 +220,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -230,7 +230,7 @@
                 </DataGridTextColumn>
 
                 <!-- Logical Reads -->
-                <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -238,7 +238,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -246,7 +246,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -254,7 +254,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -262,7 +262,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" Width="95">
+                <DataGridTextColumn Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="95">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -272,7 +272,7 @@
                 </DataGridTextColumn>
 
                 <!-- Physical Reads -->
-                <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="130">
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="130">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -280,7 +280,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N2}" Width="120">
+                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -288,7 +288,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -296,7 +296,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -304,7 +304,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -314,7 +314,7 @@
                 </DataGridTextColumn>
 
                 <!-- Logical Writes -->
-                <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -322,7 +322,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -330,7 +330,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -338,7 +338,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -346,7 +346,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" Width="95">
+                <DataGridTextColumn Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="95">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWritesDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -356,7 +356,7 @@
                 </DataGridTextColumn>
 
                 <!-- Spills -->
-                <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" Width="90">
+                <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -364,7 +364,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgSpills, StringFormat=N2}" Width="85">
+                <DataGridTextColumn Binding="{Binding AvgSpills, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -372,7 +372,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -380,7 +380,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -390,7 +390,7 @@
                 </DataGridTextColumn>
 
                 <!-- Sample Interval -->
-                <DataGridTextColumn Binding="{Binding SampleIntervalSeconds}" Width="85">
+                <DataGridTextColumn Binding="{Binding SampleIntervalSeconds}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SampleIntervalSeconds" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -399,6 +399,24 @@
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
 
+                <!-- Query Identifiers -->
+                <DataGridTextColumn Binding="{Binding SqlHandle}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SqlHandle" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="SQL Handle" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding PlanHandle}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanHandle" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Plan Handle" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+
                 <!-- Download Plan Button -->
                 <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
                     <DataGridTemplateColumn.CellTemplate>
diff --git a/Dashboard/ProcedureHistoryWindow.xaml.cs b/Dashboard/ProcedureHistoryWindow.xaml.cs
index 0a193ca8..8bf6243e 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml.cs
+++ b/Dashboard/ProcedureHistoryWindow.xaml.cs
@@ -30,10 +30,13 @@ public partial class ProcedureHistoryWindow : Window
         private readonly string _databaseName;
         private readonly int _objectId;
         private readonly string _objectName;
+        private readonly string? _schemaName;
+        private readonly string? _procedureName;
         private readonly int _hoursBack;
         private readonly DateTime? _fromDate;
         private readonly DateTime? _toDate;
         private List<ProcedureExecutionHistoryItem> _historyData = new();
+        private ChartHoverHelper? _chartHover;
 
         // Filter state
         private Dictionary<string, ColumnFilterState> _filters = new();
@@ -48,7 +51,9 @@ public ProcedureHistoryWindow(
             string objectName,
             int hoursBack = 24,
             DateTime? fromDate = null,
-            DateTime? toDate = null)
+            DateTime? toDate = null,
+            string? schemaName = null,
+            string? procedureName = null)
         {
             InitializeComponent();
 
@@ -56,6 +61,8 @@ public ProcedureHistoryWindow(
             _databaseName = databaseName;
             _objectId = objectId;
             _objectName = objectName;
+            _schemaName = schemaName;
+            _procedureName = procedureName;
             _hoursBack = hoursBack;
             _fromDate = fromDate;
             _toDate = toDate;
@@ -92,7 +99,33 @@ private async Task LoadHistoryAsync()
         {
             try
             {
-                _historyData = await _databaseService.GetProcedureStatsHistoryAsync(_databaseName, _objectId, _hoursBack, _fromDate, _toDate);
+                _historyData = !string.IsNullOrEmpty(_schemaName) && !string.IsNullOrEmpty(_procedureName)
+                    ? await _databaseService.GetProcedureStatsHistoryAsync(_databaseName, _schemaName, _procedureName, _hoursBack, _fromDate, _toDate)
+                    : await _databaseService.GetProcedureStatsHistoryAsync(_databaseName, _objectId, _hoursBack, _fromDate, _toDate);
+
+                // Compute per-interval executions. DMV counters are cumulative and reset on plan
+                // eviction, so we walk oldest→newest, detecting lifetime boundaries by CachedTime.
+                // Data arrives sorted by CollectionTime DESC, so walk from end to start.
+                for (int i = _historyData.Count - 1; i >= 0; i--)
+                {
+                    var item = _historyData[i];
+                    if (i == _historyData.Count - 1)
+                    {
+                        item.IntervalExecutions = item.ExecutionCount;
+                    }
+                    else
+                    {
+                        var olderItem = _historyData[i + 1];
+                        if (item.CachedTime != olderItem.CachedTime)
+                        {
+                            item.IntervalExecutions = item.ExecutionCount;
+                        }
+                        else
+                        {
+                            item.IntervalExecutions = Math.Max(0, item.ExecutionCount - olderItem.ExecutionCount);
+                        }
+                    }
+                }
 
                 _unfilteredData = _historyData;
                 _filters.Clear();
@@ -101,8 +134,7 @@ private async Task LoadHistoryAsync()
 
                 if (_historyData.Count > 0)
                 {
-                    var totalExecutions = _historyData.Max(h => h.ExecutionCount);
-                    var latestExecDelta = _historyData.FirstOrDefault()?.ExecutionCountDelta ?? 0;
+                    var totalExecutions = _historyData.Sum(h => h.IntervalExecutions);
                     var avgCpu = _historyData.Where(h => h.AvgWorkerTimeMs.HasValue).Select(h => h.AvgWorkerTimeMs ?? 0).DefaultIfEmpty(0).Average();
                     var avgDuration = _historyData.Where(h => h.AvgElapsedTimeMs.HasValue).Select(h => h.AvgElapsedTimeMs ?? 0).DefaultIfEmpty(0).Average();
                     var firstSample = _historyData.Min(h => h.CollectionTime);
@@ -157,14 +189,33 @@ private void UpdateChart()
             var color = ScottPlot.Color.FromHex("#4FC3F7");
             var scatter = HistoryChart.Plot.Add.Scatter(dates, values);
             scatter.Color = color;
-            scatter.LineWidth = 2;
-            scatter.MarkerSize = 6;
+
+            // Sparse data: show only markers to avoid misleading interpolated lines
+            if (dates.Length <= 1)
+            {
+                scatter.LineWidth = 0;
+                scatter.MarkerSize = 8;
+            }
+            else
+            {
+                scatter.LineWidth = 2;
+                scatter.MarkerSize = 4;
+            }
 
             HistoryChart.Plot.Axes.DateTimeTicksBottom();
             Helpers.TabHelpers.ReapplyAxisColors(HistoryChart);
             HistoryChart.Plot.YLabel(metricLabel);
             HistoryChart.Plot.XLabel("Collection Time");
 
+            // Hover tooltip
+            var unit = metricTag.Contains("Ms") ? "ms" : "";
+            if (_chartHover == null)
+                _chartHover = new ChartHoverHelper(HistoryChart, unit);
+            else
+                _chartHover.Unit = unit;
+            _chartHover.Clear();
+            _chartHover.Add(scatter, metricLabel);
+
             HistoryChart.Refresh();
         }
 
@@ -178,7 +229,7 @@ private static double GetMetricValue(ProcedureExecutionHistoryItem item, string
                 "AvgLogicalWrites" => item.AvgLogicalWrites ?? 0,
                 "AvgPhysicalReads" => item.AvgPhysicalReads ?? 0,
                 "AvgSpills" => item.AvgSpills ?? 0,
-                "ExecutionCountDelta" => item.ExecutionCountDelta ?? 0,
+                "IntervalExecutions" => item.IntervalExecutions,
                 _ => item.AvgElapsedTimeMs ?? 0
             };
         }
@@ -369,7 +420,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     foreach (var column in dataGrid.Columns)
                     {
                         if (column is DataGridBoundColumn)
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                     }
                     sb.AppendLine(string.Join("\t", headers));
                     foreach (var item in dataGrid.Items)
@@ -402,7 +453,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             foreach (var column in dataGrid.Columns)
                             {
                                 if (column is DataGridBoundColumn)
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                             }
                             sb.AppendLine(string.Join(",", headers));
                             foreach (var item in dataGrid.Items)
diff --git a/Dashboard/QueryExecutionHistoryWindow.xaml b/Dashboard/QueryExecutionHistoryWindow.xaml
index 1a8bea6a..55293b38 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:converters="clr-namespace:PerformanceMonitorDashboard.Converters"
         xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
-        Title="Query Execution History" Height="900" Width="1400"
+        Title="Query Execution History" Height="900" Width="1600"
         WindowStartupLocation="CenterOwner"
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
@@ -31,8 +31,8 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="2*" MinHeight="250"/>
-            <RowDefinition Height="3*"/>
+            <RowDefinition Height="3*" MinHeight="300"/>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
@@ -96,7 +96,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding PlanId}" Width="70">
+                <DataGridTextColumn Binding="{Binding PlanId}" ElementStyle="{StaticResource NumericCell}" Width="70">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanId" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -104,7 +104,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding CountExecutions, StringFormat=N0}" Width="90">
+                <DataGridTextColumn Binding="{Binding CountExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CountExecutions" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -114,7 +114,7 @@
                 </DataGridTextColumn>
 
                 <!-- Duration (ms) -->
-                <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -122,7 +122,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinDurationMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinDurationMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -130,7 +130,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxDurationMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxDurationMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -140,7 +140,7 @@
                 </DataGridTextColumn>
 
                 <!-- CPU (ms) -->
-                <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -148,7 +148,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinCpuTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding MinCpuTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinCpuTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -156,7 +156,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxCpuTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding MaxCpuTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxCpuTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -166,7 +166,7 @@
                 </DataGridTextColumn>
 
                 <!-- Logical Reads -->
-                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -174,7 +174,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -182,7 +182,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -192,7 +192,7 @@
                 </DataGridTextColumn>
 
                 <!-- Logical Writes -->
-                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -200,7 +200,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -208,7 +208,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -218,7 +218,7 @@
                 </DataGridTextColumn>
 
                 <!-- Physical Reads -->
-                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -226,7 +226,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -234,7 +234,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -244,7 +244,7 @@
                 </DataGridTextColumn>
 
                 <!-- DOP -->
-                <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                <DataGridTextColumn Binding="{Binding MinDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -252,7 +252,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxDop}" Width="70">
+                <DataGridTextColumn Binding="{Binding MaxDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -262,7 +262,7 @@
                 </DataGridTextColumn>
 
                 <!-- Memory (MB) -->
-                <DataGridTextColumn Binding="{Binding AvgMemoryMb, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgMemoryMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgMemoryMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -270,7 +270,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinMemoryMb, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinMemoryMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinMemoryMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -278,7 +278,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxMemoryMb, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxMemoryMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxMemoryMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -288,7 +288,7 @@
                 </DataGridTextColumn>
 
                 <!-- Row Count -->
-                <DataGridTextColumn Binding="{Binding AvgRowcount, StringFormat=N0}" Width="90">
+                <DataGridTextColumn Binding="{Binding AvgRowcount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRowcount" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -296,7 +296,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinRowcount, StringFormat=N0}" Width="90">
+                <DataGridTextColumn Binding="{Binding MinRowcount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRowcount" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -304,7 +304,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxRowcount, StringFormat=N0}" Width="90">
+                <DataGridTextColumn Binding="{Binding MaxRowcount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRowcount" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -314,7 +314,7 @@
                 </DataGridTextColumn>
 
                 <!-- TempDB (MB) -->
-                <DataGridTextColumn Binding="{Binding AvgTempdbMb, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgTempdbMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgTempdbMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -322,7 +322,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinTempdbMb, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinTempdbMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinTempdbMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -330,7 +330,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxTempdbMb, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxTempdbMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxTempdbMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -356,7 +356,7 @@
                         </StackPanel>
                     </DataGridCheckBoxColumn.Header>
                 </DataGridCheckBoxColumn>
-                <DataGridTextColumn Binding="{Binding ForceFailureCount}" Width="100">
+                <DataGridTextColumn Binding="{Binding ForceFailureCount}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ForceFailureCount" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -380,7 +380,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding CompatibilityLevel}" Width="90">
+                <DataGridTextColumn Binding="{Binding CompatibilityLevel}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CompatibilityLevel" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -389,6 +389,24 @@
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
 
+                <!-- Query Identifiers -->
+                <DataGridTextColumn Binding="{Binding QueryHash}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryHash" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Query Hash" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding QueryPlanHash}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryPlanHash" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Query Plan Hash" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+
                 <!-- Download Plan Button -->
                 <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
                     <DataGridTemplateColumn.CellTemplate>
diff --git a/Dashboard/QueryExecutionHistoryWindow.xaml.cs b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
index b0479cc7..06f4fb7c 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml.cs
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
@@ -35,6 +35,7 @@ public partial class QueryExecutionHistoryWindow : Window
         private readonly DateTime? _toDate;
         private List<QueryExecutionHistoryItem> _historyData = new();
         private ScottPlot.IPanel? _legendPanel;
+        private ChartHoverHelper? _chartHover;
 
         // Filter state
         private Dictionary<string, ColumnFilterState> _filters = new();
@@ -181,8 +182,8 @@ private void UpdateChart()
                 ScottPlot.Color.FromHex("#A1887F")
             };
 
-            var legendParts = new List<string>();
             int colorIndex = 0;
+            var scatterSeries = new List<(ScottPlot.Plottables.Scatter Scatter, string Label)>();
 
             foreach (var planGroup in planGroups)
             {
@@ -197,11 +198,23 @@ private void UpdateChart()
                 var color = colors[colorIndex % colors.Length];
                 var scatter = HistoryChart.Plot.Add.Scatter(dates, values);
                 scatter.Color = color;
-                scatter.LineWidth = 2;
-                scatter.MarkerSize = 6;
-                scatter.LegendText = $"Plan {planGroup.Key}";
+                var label = $"Plan {planGroup.Key}";
+                scatter.LegendText = label;
 
-                legendParts.Add($"Plan {planGroup.Key}");
+                // Sparse data: use total dataset size, not per-plan size, since
+                // data is split across plan groups
+                if (_historyData.Count <= 1)
+                {
+                    scatter.LineWidth = 0;
+                    scatter.MarkerSize = 8;
+                }
+                else
+                {
+                    scatter.LineWidth = 2;
+                    scatter.MarkerSize = 4;
+                }
+
+                scatterSeries.Add((scatter, label));
                 colorIndex++;
             }
 
@@ -212,6 +225,16 @@ private void UpdateChart()
             _legendPanel = HistoryChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
             HistoryChart.Plot.Legend.FontSize = 12;
 
+            // Hover tooltip
+            var unit = metricTag.Contains("Ms") ? "ms" : "";
+            if (_chartHover == null)
+                _chartHover = new ChartHoverHelper(HistoryChart, unit);
+            else
+                _chartHover.Unit = unit;
+            _chartHover.Clear();
+            foreach (var (s, l) in scatterSeries)
+                _chartHover.Add(s, l);
+
             // Update legend text
             ChartLegendText.Text = planGroups.Count > 1
                 ? $"{planGroups.Count} different plans detected"
@@ -421,7 +444,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     foreach (var column in dataGrid.Columns)
                     {
                         if (column is DataGridBoundColumn)
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                     }
                     sb.AppendLine(string.Join("\t", headers));
                     foreach (var item in dataGrid.Items)
@@ -454,7 +477,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             foreach (var column in dataGrid.Columns)
                             {
                                 if (column is DataGridBoundColumn)
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                             }
                             sb.AppendLine(string.Join(",", headers));
                             foreach (var item in dataGrid.Items)
diff --git a/Dashboard/QueryStatsHistoryWindow.xaml b/Dashboard/QueryStatsHistoryWindow.xaml
index e76d826c..d222e41c 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml
+++ b/Dashboard/QueryStatsHistoryWindow.xaml
@@ -31,8 +31,8 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="2*" MinHeight="250"/>
-            <RowDefinition Height="3*"/>
+            <RowDefinition Height="3*" MinHeight="300"/>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
@@ -62,7 +62,7 @@
                         <ComboBoxItem Content="Avg Logical Writes" Tag="AvgLogicalWrites"/>
                         <ComboBoxItem Content="Avg Physical Reads" Tag="AvgPhysicalReads"/>
                         <ComboBoxItem Content="Avg Rows" Tag="AvgRows"/>
-                        <ComboBoxItem Content="Execution Count Delta" Tag="ExecutionCountDelta"/>
+                        <ComboBoxItem Content="Executions Per Interval" Tag="IntervalExecutions"/>
                     </ComboBox>
                 </StackPanel>
 
@@ -119,16 +119,16 @@
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
 
-                <!-- Execution Count -->
-                <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90">
+                <!-- Execution Count (per-interval, computed from cumulative counter) -->
+                <DataGridTextColumn Binding="{Binding IntervalExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
-                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IntervalExecutions" Click="Filter_Click" Margin="0,0,4,0"/>
                             <TextBlock Text="Exec Count" FontWeight="Bold" VerticalAlignment="Center"/>
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding ExecutionCountDelta, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding ExecutionCountDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCountDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -138,7 +138,7 @@
                 </DataGridTextColumn>
 
                 <!-- Worker Time (CPU) - Total/Avg/Min/Max -->
-                <DataGridTextColumn Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" Width="110">
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="110">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -146,7 +146,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -154,7 +154,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -162,7 +162,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" Width="100">
+                <DataGridTextColumn Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -170,7 +170,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" Width="105">
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="105">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -180,7 +180,7 @@
                 </DataGridTextColumn>
 
                 <!-- Elapsed Time - Total/Avg/Min/Max -->
-                <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -188,7 +188,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -196,7 +196,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -204,7 +204,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -212,7 +212,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -222,7 +222,7 @@
                 </DataGridTextColumn>
 
                 <!-- Logical Reads -->
-                <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -230,7 +230,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -238,7 +238,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" Width="95">
+                <DataGridTextColumn Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="95">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -248,7 +248,7 @@
                 </DataGridTextColumn>
 
                 <!-- Physical Reads -->
-                <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="130">
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="130">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -256,7 +256,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N2}" Width="120">
+                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -264,7 +264,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -272,7 +272,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120">
+                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -280,7 +280,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" Width="115">
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -290,7 +290,7 @@
                 </DataGridTextColumn>
 
                 <!-- Logical Writes -->
-                <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="125">
+                <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="125">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -298,7 +298,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N2}" Width="115">
+                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="115">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -306,7 +306,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" Width="95">
+                <DataGridTextColumn Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="95">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWritesDelta" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -316,7 +316,7 @@
                 </DataGridTextColumn>
 
                 <!-- Rows -->
-                <DataGridTextColumn Binding="{Binding TotalRows, StringFormat=N0}" Width="100">
+                <DataGridTextColumn Binding="{Binding TotalRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRows" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -324,7 +324,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding AvgRows, StringFormat=N2}" Width="90">
+                <DataGridTextColumn Binding="{Binding AvgRows, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRows" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -332,7 +332,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinRows, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding MinRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRows" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -340,7 +340,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxRows, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding MaxRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRows" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -350,7 +350,7 @@
                 </DataGridTextColumn>
 
                 <!-- Parallelism -->
-                <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                <DataGridTextColumn Binding="{Binding MinDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -358,7 +358,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxDop}" Width="70">
+                <DataGridTextColumn Binding="{Binding MaxDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -368,7 +368,7 @@
                 </DataGridTextColumn>
 
                 <!-- Memory Grants -->
-                <DataGridTextColumn Binding="{Binding MaxGrantMb, StringFormat=N2}" Width="105">
+                <DataGridTextColumn Binding="{Binding MaxGrantMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="105">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxGrantMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -376,7 +376,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxUsedGrantMb, StringFormat=N2}" Width="105">
+                <DataGridTextColumn Binding="{Binding MaxUsedGrantMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="105">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxUsedGrantMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -384,7 +384,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxIdealGrantMb, StringFormat=N2}" Width="105">
+                <DataGridTextColumn Binding="{Binding MaxIdealGrantMb, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="105">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxIdealGrantMb" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -394,7 +394,7 @@
                 </DataGridTextColumn>
 
                 <!-- Thread Usage -->
-                <DataGridTextColumn Binding="{Binding MinUsedThreads}" Width="85">
+                <DataGridTextColumn Binding="{Binding MinUsedThreads}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinUsedThreads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -402,7 +402,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxUsedThreads}" Width="85">
+                <DataGridTextColumn Binding="{Binding MaxUsedThreads}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxUsedThreads" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -412,7 +412,7 @@
                 </DataGridTextColumn>
 
                 <!-- Spills -->
-                <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" Width="90">
+                <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -420,7 +420,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -428,7 +428,7 @@
                         </StackPanel>
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
-                <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" Width="85">
+                <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -438,7 +438,7 @@
                 </DataGridTextColumn>
 
                 <!-- CLR Time -->
-                <DataGridTextColumn Binding="{Binding TotalClrTime, StringFormat=N0}" Width="100">
+                <DataGridTextColumn Binding="{Binding TotalClrTime, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalClrTime" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -448,7 +448,7 @@
                 </DataGridTextColumn>
 
                 <!-- Sample Interval -->
-                <DataGridTextColumn Binding="{Binding SampleIntervalSeconds}" Width="85">
+                <DataGridTextColumn Binding="{Binding SampleIntervalSeconds}" ElementStyle="{StaticResource NumericCell}" Width="85">
                     <DataGridTextColumn.Header>
                         <StackPanel Orientation="Horizontal">
                             <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SampleIntervalSeconds" Click="Filter_Click" Margin="0,0,4,0"/>
@@ -457,6 +457,40 @@
                     </DataGridTextColumn.Header>
                 </DataGridTextColumn>
 
+                <!-- Query Identifiers -->
+                <DataGridTextColumn Binding="{Binding SqlHandle}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SqlHandle" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="SQL Handle" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding PlanHandle}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanHandle" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Plan Handle" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding QueryHash}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryHash" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Query Hash" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding QueryPlanHash}" Width="160">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryPlanHash" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Query Plan Hash" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+
                 <!-- Download Plan Button -->
                 <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
                     <DataGridTemplateColumn.CellTemplate>
diff --git a/Dashboard/QueryStatsHistoryWindow.xaml.cs b/Dashboard/QueryStatsHistoryWindow.xaml.cs
index 8ce357ff..4e1b0145 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml.cs
+++ b/Dashboard/QueryStatsHistoryWindow.xaml.cs
@@ -33,6 +33,7 @@ public partial class QueryStatsHistoryWindow : Window
         private readonly DateTime? _fromDate;
         private readonly DateTime? _toDate;
         private List<QueryStatsHistoryItem> _historyData = new();
+        private ChartHoverHelper? _chartHover;
 
         // Filter state
         private Dictionary<string, ColumnFilterState> _filters = new();
@@ -91,6 +92,33 @@ private async Task LoadHistoryAsync()
             {
                 _historyData = await _databaseService.GetQueryStatsHistoryAsync(_databaseName, _queryHash, _hoursBack, _fromDate, _toDate);
 
+                // Compute per-interval executions. DMV counters are cumulative and reset on plan
+                // eviction, so we walk oldest→newest, detecting lifetime boundaries by CreationTime.
+                // Data arrives sorted by CollectionTime DESC, so walk from end to start.
+                for (int i = _historyData.Count - 1; i >= 0; i--)
+                {
+                    var item = _historyData[i];
+                    if (i == _historyData.Count - 1)
+                    {
+                        // Oldest row in window: credit all executions (no prior reference)
+                        item.IntervalExecutions = item.ExecutionCount;
+                    }
+                    else
+                    {
+                        var olderItem = _historyData[i + 1];
+                        if (item.CreationTime != olderItem.CreationTime)
+                        {
+                            // New plan lifetime (eviction + re-cache): credit all executions
+                            item.IntervalExecutions = item.ExecutionCount;
+                        }
+                        else
+                        {
+                            // Same lifetime: delta from previous snapshot
+                            item.IntervalExecutions = Math.Max(0, item.ExecutionCount - olderItem.ExecutionCount);
+                        }
+                    }
+                }
+
                 _unfilteredData = _historyData;
                 _filters.Clear();
                 HistoryDataGrid.ItemsSource = _historyData;
@@ -98,8 +126,7 @@ private async Task LoadHistoryAsync()
 
                 if (_historyData.Count > 0)
                 {
-                    var totalExecutions = _historyData.Max(h => h.ExecutionCount);
-                    var latestExecDelta = _historyData.FirstOrDefault()?.ExecutionCountDelta ?? 0;
+                    var totalExecutions = _historyData.Sum(h => h.IntervalExecutions);
                     var avgCpu = _historyData.Where(h => h.AvgWorkerTimeMs.HasValue).Select(h => h.AvgWorkerTimeMs ?? 0).DefaultIfEmpty(0).Average();
                     var avgDuration = _historyData.Where(h => h.AvgElapsedTimeMs.HasValue).Select(h => h.AvgElapsedTimeMs ?? 0).DefaultIfEmpty(0).Average();
                     var firstSample = _historyData.Min(h => h.CollectionTime);
@@ -154,14 +181,33 @@ private void UpdateChart()
             var color = ScottPlot.Color.FromHex("#4FC3F7");
             var scatter = HistoryChart.Plot.Add.Scatter(dates, values);
             scatter.Color = color;
-            scatter.LineWidth = 2;
-            scatter.MarkerSize = 6;
+
+            // Sparse data: show only markers to avoid misleading interpolated lines
+            if (dates.Length <= 1)
+            {
+                scatter.LineWidth = 0;
+                scatter.MarkerSize = 8;
+            }
+            else
+            {
+                scatter.LineWidth = 2;
+                scatter.MarkerSize = 4;
+            }
 
             HistoryChart.Plot.Axes.DateTimeTicksBottom();
             Helpers.TabHelpers.ReapplyAxisColors(HistoryChart);
             HistoryChart.Plot.YLabel(metricLabel);
             HistoryChart.Plot.XLabel("Collection Time");
 
+            // Hover tooltip
+            var unit = metricTag.Contains("Ms") ? "ms" : "";
+            if (_chartHover == null)
+                _chartHover = new ChartHoverHelper(HistoryChart, unit);
+            else
+                _chartHover.Unit = unit;
+            _chartHover.Clear();
+            _chartHover.Add(scatter, metricLabel);
+
             HistoryChart.Refresh();
         }
 
@@ -175,7 +221,7 @@ private static double GetMetricValue(QueryStatsHistoryItem item, string metricTa
                 "AvgLogicalWrites" => item.AvgLogicalWrites ?? 0,
                 "AvgPhysicalReads" => item.AvgPhysicalReads ?? 0,
                 "AvgRows" => item.AvgRows ?? 0,
-                "ExecutionCountDelta" => item.ExecutionCountDelta ?? 0,
+                "IntervalExecutions" => item.IntervalExecutions,
                 _ => item.AvgElapsedTimeMs ?? 0
             };
         }
@@ -366,7 +412,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     foreach (var column in dataGrid.Columns)
                     {
                         if (column is DataGridBoundColumn)
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                     }
                     sb.AppendLine(string.Join("\t", headers));
                     foreach (var item in dataGrid.Items)
@@ -399,7 +445,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             foreach (var column in dataGrid.Columns)
                             {
                                 if (column is DataGridBoundColumn)
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                             }
                             sb.AppendLine(string.Join(",", headers));
                             foreach (var item in dataGrid.Items)
diff --git a/Dashboard/RemoveServerDialog.xaml b/Dashboard/RemoveServerDialog.xaml
new file mode 100644
index 00000000..dd0d6f02
--- /dev/null
+++ b/Dashboard/RemoveServerDialog.xaml
@@ -0,0 +1,39 @@
+<Window x:Class="PerformanceMonitorDashboard.RemoveServerDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Confirm Remove Server"
+        Height="230" Width="450"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Background="{DynamicResource BackgroundBrush}">
+    <Window.Resources>
+        <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    </Window.Resources>
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Warning message -->
+        <TextBlock Grid.Row="0" x:Name="WarningText" TextWrapping="Wrap" FontSize="13" Margin="0,0,0,15"/>
+
+        <!-- Drop database checkbox -->
+        <CheckBox Grid.Row="1" x:Name="DropDatabaseCheckBox" Margin="0,0,0,5"
+                  Foreground="{DynamicResource ForegroundBrush}">
+            <TextBlock Text="Also drop the PerformanceMonitor database and SQL Agent jobs on this server" TextWrapping="Wrap"/>
+        </CheckBox>
+        <TextBlock Grid.Row="2" Text="Warning: all collected monitoring data and scheduled collection jobs on the server will be permanently deleted."
+                   FontSize="11" Foreground="{DynamicResource ErrorBrush}" Margin="20,0,0,15"
+                   TextWrapping="Wrap" Visibility="{Binding ElementName=DropDatabaseCheckBox, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}}"/>
+
+        <!-- Buttons -->
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Content="Remove" Width="80" Height="28" Margin="0,0,8,0" Click="Remove_Click"
+                    Foreground="{DynamicResource ErrorBrush}"/>
+            <Button Content="Cancel" Width="80" Height="28" Click="Cancel_Click" IsCancel="True"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Dashboard/RemoveServerDialog.xaml.cs b/Dashboard/RemoveServerDialog.xaml.cs
new file mode 100644
index 00000000..e0f93078
--- /dev/null
+++ b/Dashboard/RemoveServerDialog.xaml.cs
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Windows;
+
+namespace PerformanceMonitorDashboard
+{
+    public partial class RemoveServerDialog : Window
+    {
+        public bool DropDatabase => DropDatabaseCheckBox.IsChecked == true;
+
+        public RemoveServerDialog(string serverDisplayName)
+        {
+            InitializeComponent();
+            WarningText.Text = $"Are you sure you want to remove server '{serverDisplayName}'?\n\nThis action cannot be undone.";
+        }
+
+        private void Remove_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+    }
+}
diff --git a/Dashboard/Resources/PlanIcons/adaptive_join.png b/Dashboard/Resources/PlanIcons/adaptive_join.png
new file mode 100644
index 00000000..a9de8452
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/adaptive_join.png differ
diff --git a/Dashboard/Resources/PlanIcons/aggregate.png b/Dashboard/Resources/PlanIcons/aggregate.png
new file mode 100644
index 00000000..c9dfa1ab
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/aggregate.png differ
diff --git a/Dashboard/Resources/PlanIcons/apply.png b/Dashboard/Resources/PlanIcons/apply.png
new file mode 100644
index 00000000..0e4972da
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/apply.png differ
diff --git a/Dashboard/Resources/PlanIcons/arithmetic_expression.png b/Dashboard/Resources/PlanIcons/arithmetic_expression.png
new file mode 100644
index 00000000..532e6985
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/arithmetic_expression.png differ
diff --git a/Dashboard/Resources/PlanIcons/assert.png b/Dashboard/Resources/PlanIcons/assert.png
new file mode 100644
index 00000000..8c828bf9
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/assert.png differ
diff --git a/Dashboard/Resources/PlanIcons/assign.png b/Dashboard/Resources/PlanIcons/assign.png
new file mode 100644
index 00000000..6006369e
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/assign.png differ
diff --git a/Dashboard/Resources/PlanIcons/batch_hash_table_build.png b/Dashboard/Resources/PlanIcons/batch_hash_table_build.png
new file mode 100644
index 00000000..f955ff4e
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/batch_hash_table_build.png differ
diff --git a/Dashboard/Resources/PlanIcons/bitmap.png b/Dashboard/Resources/PlanIcons/bitmap.png
new file mode 100644
index 00000000..9010b0b7
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/bitmap.png differ
diff --git a/Dashboard/Resources/PlanIcons/bookmark_lookup.png b/Dashboard/Resources/PlanIcons/bookmark_lookup.png
new file mode 100644
index 00000000..89d5d116
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/bookmark_lookup.png differ
diff --git a/Dashboard/Resources/PlanIcons/broadcast.png b/Dashboard/Resources/PlanIcons/broadcast.png
new file mode 100644
index 00000000..05735c5a
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/broadcast.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_index_delete.png b/Dashboard/Resources/PlanIcons/clustered_index_delete.png
new file mode 100644
index 00000000..6da544c7
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_index_delete.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_index_insert.png b/Dashboard/Resources/PlanIcons/clustered_index_insert.png
new file mode 100644
index 00000000..4706b31b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_index_insert.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_index_merge.png b/Dashboard/Resources/PlanIcons/clustered_index_merge.png
new file mode 100644
index 00000000..c8191635
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_index_merge.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_index_scan.png b/Dashboard/Resources/PlanIcons/clustered_index_scan.png
new file mode 100644
index 00000000..58faec26
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_index_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_index_seek.png b/Dashboard/Resources/PlanIcons/clustered_index_seek.png
new file mode 100644
index 00000000..13094bad
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_index_seek.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_index_update.png b/Dashboard/Resources/PlanIcons/clustered_index_update.png
new file mode 100644
index 00000000..956a8138
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_index_update.png differ
diff --git a/Dashboard/Resources/PlanIcons/clustered_update.png b/Dashboard/Resources/PlanIcons/clustered_update.png
new file mode 100644
index 00000000..15ccb904
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/clustered_update.png differ
diff --git a/Dashboard/Resources/PlanIcons/collapse.png b/Dashboard/Resources/PlanIcons/collapse.png
new file mode 100644
index 00000000..7e241912
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/collapse.png differ
diff --git a/Dashboard/Resources/PlanIcons/columnstore_index_delete.png b/Dashboard/Resources/PlanIcons/columnstore_index_delete.png
new file mode 100644
index 00000000..cac4731c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/columnstore_index_delete.png differ
diff --git a/Dashboard/Resources/PlanIcons/columnstore_index_insert.png b/Dashboard/Resources/PlanIcons/columnstore_index_insert.png
new file mode 100644
index 00000000..110242bf
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/columnstore_index_insert.png differ
diff --git a/Dashboard/Resources/PlanIcons/columnstore_index_merge.png b/Dashboard/Resources/PlanIcons/columnstore_index_merge.png
new file mode 100644
index 00000000..cd5f7643
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/columnstore_index_merge.png differ
diff --git a/Dashboard/Resources/PlanIcons/columnstore_index_scan.png b/Dashboard/Resources/PlanIcons/columnstore_index_scan.png
new file mode 100644
index 00000000..de030b6b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/columnstore_index_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/columnstore_index_update.png b/Dashboard/Resources/PlanIcons/columnstore_index_update.png
new file mode 100644
index 00000000..f0b2ad13
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/columnstore_index_update.png differ
diff --git a/Dashboard/Resources/PlanIcons/compute_scalar.png b/Dashboard/Resources/PlanIcons/compute_scalar.png
new file mode 100644
index 00000000..7ce66cea
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/compute_scalar.png differ
diff --git a/Dashboard/Resources/PlanIcons/compute_to_control_node.png b/Dashboard/Resources/PlanIcons/compute_to_control_node.png
new file mode 100644
index 00000000..98c0c95e
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/compute_to_control_node.png differ
diff --git a/Dashboard/Resources/PlanIcons/concatenation.png b/Dashboard/Resources/PlanIcons/concatenation.png
new file mode 100644
index 00000000..214d6835
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/concatenation.png differ
diff --git a/Dashboard/Resources/PlanIcons/const_table_get.png b/Dashboard/Resources/PlanIcons/const_table_get.png
new file mode 100644
index 00000000..0f32261c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/const_table_get.png differ
diff --git a/Dashboard/Resources/PlanIcons/constant_scan.png b/Dashboard/Resources/PlanIcons/constant_scan.png
new file mode 100644
index 00000000..88c1354b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/constant_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/control_to_compute_nodes.png b/Dashboard/Resources/PlanIcons/control_to_compute_nodes.png
new file mode 100644
index 00000000..47066d97
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/control_to_compute_nodes.png differ
diff --git a/Dashboard/Resources/PlanIcons/convert.png b/Dashboard/Resources/PlanIcons/convert.png
new file mode 100644
index 00000000..badf83c7
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/convert.png differ
diff --git a/Dashboard/Resources/PlanIcons/cursor_catch_all.png b/Dashboard/Resources/PlanIcons/cursor_catch_all.png
new file mode 100644
index 00000000..7344f5dd
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/cursor_catch_all.png differ
diff --git a/Dashboard/Resources/PlanIcons/declare.png b/Dashboard/Resources/PlanIcons/declare.png
new file mode 100644
index 00000000..7d7f97b3
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/declare.png differ
diff --git a/Dashboard/Resources/PlanIcons/delete.png b/Dashboard/Resources/PlanIcons/delete.png
new file mode 100644
index 00000000..2d1e1225
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/delete.png differ
diff --git a/Dashboard/Resources/PlanIcons/deleted_scan.png b/Dashboard/Resources/PlanIcons/deleted_scan.png
new file mode 100644
index 00000000..84e6c0ab
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/deleted_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/dynamic.png b/Dashboard/Resources/PlanIcons/dynamic.png
new file mode 100644
index 00000000..01e92669
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/dynamic.png differ
diff --git a/Dashboard/Resources/PlanIcons/external_broadcast.png b/Dashboard/Resources/PlanIcons/external_broadcast.png
new file mode 100644
index 00000000..373f0180
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/external_broadcast.png differ
diff --git a/Dashboard/Resources/PlanIcons/external_export.png b/Dashboard/Resources/PlanIcons/external_export.png
new file mode 100644
index 00000000..75331148
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/external_export.png differ
diff --git a/Dashboard/Resources/PlanIcons/external_local_streaming.png b/Dashboard/Resources/PlanIcons/external_local_streaming.png
new file mode 100644
index 00000000..48889aed
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/external_local_streaming.png differ
diff --git a/Dashboard/Resources/PlanIcons/external_round_robin.png b/Dashboard/Resources/PlanIcons/external_round_robin.png
new file mode 100644
index 00000000..b0202d4f
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/external_round_robin.png differ
diff --git a/Dashboard/Resources/PlanIcons/external_shuffle.png b/Dashboard/Resources/PlanIcons/external_shuffle.png
new file mode 100644
index 00000000..6d7c24cf
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/external_shuffle.png differ
diff --git a/Dashboard/Resources/PlanIcons/fetch_query.png b/Dashboard/Resources/PlanIcons/fetch_query.png
new file mode 100644
index 00000000..a1fd0f12
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/fetch_query.png differ
diff --git a/Dashboard/Resources/PlanIcons/filter.png b/Dashboard/Resources/PlanIcons/filter.png
new file mode 100644
index 00000000..af726e90
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/filter.png differ
diff --git a/Dashboard/Resources/PlanIcons/foreign_key_references_check.png b/Dashboard/Resources/PlanIcons/foreign_key_references_check.png
new file mode 100644
index 00000000..f87b6443
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/foreign_key_references_check.png differ
diff --git a/Dashboard/Resources/PlanIcons/get.png b/Dashboard/Resources/PlanIcons/get.png
new file mode 100644
index 00000000..79e832f2
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/get.png differ
diff --git a/Dashboard/Resources/PlanIcons/group_by_aggregate.png b/Dashboard/Resources/PlanIcons/group_by_aggregate.png
new file mode 100644
index 00000000..cdb1bf9e
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/group_by_aggregate.png differ
diff --git a/Dashboard/Resources/PlanIcons/hash_match.png b/Dashboard/Resources/PlanIcons/hash_match.png
new file mode 100644
index 00000000..fb78ddcf
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/hash_match.png differ
diff --git a/Dashboard/Resources/PlanIcons/hash_match_root.png b/Dashboard/Resources/PlanIcons/hash_match_root.png
new file mode 100644
index 00000000..07f46f53
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/hash_match_root.png differ
diff --git a/Dashboard/Resources/PlanIcons/hash_match_team.png b/Dashboard/Resources/PlanIcons/hash_match_team.png
new file mode 100644
index 00000000..c1070796
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/hash_match_team.png differ
diff --git a/Dashboard/Resources/PlanIcons/if.png b/Dashboard/Resources/PlanIcons/if.png
new file mode 100644
index 00000000..0aedbcb3
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/if.png differ
diff --git a/Dashboard/Resources/PlanIcons/index_delete.png b/Dashboard/Resources/PlanIcons/index_delete.png
new file mode 100644
index 00000000..c367019f
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/index_delete.png differ
diff --git a/Dashboard/Resources/PlanIcons/index_insert.png b/Dashboard/Resources/PlanIcons/index_insert.png
new file mode 100644
index 00000000..723e71a5
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/index_insert.png differ
diff --git a/Dashboard/Resources/PlanIcons/index_scan.png b/Dashboard/Resources/PlanIcons/index_scan.png
new file mode 100644
index 00000000..e373d6c8
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/index_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/index_seek.png b/Dashboard/Resources/PlanIcons/index_seek.png
new file mode 100644
index 00000000..093805cd
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/index_seek.png differ
diff --git a/Dashboard/Resources/PlanIcons/index_spool.png b/Dashboard/Resources/PlanIcons/index_spool.png
new file mode 100644
index 00000000..5d0fa8f6
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/index_spool.png differ
diff --git a/Dashboard/Resources/PlanIcons/index_update.png b/Dashboard/Resources/PlanIcons/index_update.png
new file mode 100644
index 00000000..0b4570e4
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/index_update.png differ
diff --git a/Dashboard/Resources/PlanIcons/insert.png b/Dashboard/Resources/PlanIcons/insert.png
new file mode 100644
index 00000000..87fca574
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/insert.png differ
diff --git a/Dashboard/Resources/PlanIcons/inserted_scan.png b/Dashboard/Resources/PlanIcons/inserted_scan.png
new file mode 100644
index 00000000..4f2db17c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/inserted_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/intrinsic.png b/Dashboard/Resources/PlanIcons/intrinsic.png
new file mode 100644
index 00000000..8c5b614e
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/intrinsic.png differ
diff --git a/Dashboard/Resources/PlanIcons/iterator_catch_all.png b/Dashboard/Resources/PlanIcons/iterator_catch_all.png
new file mode 100644
index 00000000..5a2d728d
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/iterator_catch_all.png differ
diff --git a/Dashboard/Resources/PlanIcons/join.png b/Dashboard/Resources/PlanIcons/join.png
new file mode 100644
index 00000000..aefe5b44
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/join.png differ
diff --git a/Dashboard/Resources/PlanIcons/keyset.png b/Dashboard/Resources/PlanIcons/keyset.png
new file mode 100644
index 00000000..f6371f4c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/keyset.png differ
diff --git a/Dashboard/Resources/PlanIcons/language_construct_catch_all.png b/Dashboard/Resources/PlanIcons/language_construct_catch_all.png
new file mode 100644
index 00000000..2d247ce7
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/language_construct_catch_all.png differ
diff --git a/Dashboard/Resources/PlanIcons/locate.png b/Dashboard/Resources/PlanIcons/locate.png
new file mode 100644
index 00000000..5cba6679
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/locate.png differ
diff --git a/Dashboard/Resources/PlanIcons/log_row_scan.png b/Dashboard/Resources/PlanIcons/log_row_scan.png
new file mode 100644
index 00000000..bfe7875f
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/log_row_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/merge_interval.png b/Dashboard/Resources/PlanIcons/merge_interval.png
new file mode 100644
index 00000000..98b2aef9
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/merge_interval.png differ
diff --git a/Dashboard/Resources/PlanIcons/merge_join.png b/Dashboard/Resources/PlanIcons/merge_join.png
new file mode 100644
index 00000000..b9c1bcee
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/merge_join.png differ
diff --git a/Dashboard/Resources/PlanIcons/nested_loops.png b/Dashboard/Resources/PlanIcons/nested_loops.png
new file mode 100644
index 00000000..89f6c764
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/nested_loops.png differ
diff --git a/Dashboard/Resources/PlanIcons/parallelism.png b/Dashboard/Resources/PlanIcons/parallelism.png
new file mode 100644
index 00000000..45d28d80
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/parallelism.png differ
diff --git a/Dashboard/Resources/PlanIcons/parameter_table_scan.png b/Dashboard/Resources/PlanIcons/parameter_table_scan.png
new file mode 100644
index 00000000..5dd33d65
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/parameter_table_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/population_query.png b/Dashboard/Resources/PlanIcons/population_query.png
new file mode 100644
index 00000000..172c90e8
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/population_query.png differ
diff --git a/Dashboard/Resources/PlanIcons/predict.png b/Dashboard/Resources/PlanIcons/predict.png
new file mode 100644
index 00000000..deb2b309
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/predict.png differ
diff --git a/Dashboard/Resources/PlanIcons/print.png b/Dashboard/Resources/PlanIcons/print.png
new file mode 100644
index 00000000..9ecab730
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/print.png differ
diff --git a/Dashboard/Resources/PlanIcons/project.png b/Dashboard/Resources/PlanIcons/project.png
new file mode 100644
index 00000000..be9d1765
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/project.png differ
diff --git a/Dashboard/Resources/PlanIcons/rank.png b/Dashboard/Resources/PlanIcons/rank.png
new file mode 100644
index 00000000..00845904
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/rank.png differ
diff --git a/Dashboard/Resources/PlanIcons/refresh_query.png b/Dashboard/Resources/PlanIcons/refresh_query.png
new file mode 100644
index 00000000..eeb4e751
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/refresh_query.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_delete.png b/Dashboard/Resources/PlanIcons/remote_delete.png
new file mode 100644
index 00000000..6c4d1b7b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_delete.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_index_scan.png b/Dashboard/Resources/PlanIcons/remote_index_scan.png
new file mode 100644
index 00000000..1f06dd59
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_index_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_index_seek.png b/Dashboard/Resources/PlanIcons/remote_index_seek.png
new file mode 100644
index 00000000..94e66cb8
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_index_seek.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_insert.png b/Dashboard/Resources/PlanIcons/remote_insert.png
new file mode 100644
index 00000000..9a22f89c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_insert.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_query.png b/Dashboard/Resources/PlanIcons/remote_query.png
new file mode 100644
index 00000000..073dcef4
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_query.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_scan.png b/Dashboard/Resources/PlanIcons/remote_scan.png
new file mode 100644
index 00000000..24a43a95
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/remote_update.png b/Dashboard/Resources/PlanIcons/remote_update.png
new file mode 100644
index 00000000..f027393c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/remote_update.png differ
diff --git a/Dashboard/Resources/PlanIcons/result.png b/Dashboard/Resources/PlanIcons/result.png
new file mode 100644
index 00000000..e3545a1b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/result.png differ
diff --git a/Dashboard/Resources/PlanIcons/rid_lookup.png b/Dashboard/Resources/PlanIcons/rid_lookup.png
new file mode 100644
index 00000000..83ad0c04
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/rid_lookup.png differ
diff --git a/Dashboard/Resources/PlanIcons/row_count_spool.png b/Dashboard/Resources/PlanIcons/row_count_spool.png
new file mode 100644
index 00000000..40ee6c52
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/row_count_spool.png differ
diff --git a/Dashboard/Resources/PlanIcons/segment.png b/Dashboard/Resources/PlanIcons/segment.png
new file mode 100644
index 00000000..64e1218f
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/segment.png differ
diff --git a/Dashboard/Resources/PlanIcons/sequence.png b/Dashboard/Resources/PlanIcons/sequence.png
new file mode 100644
index 00000000..1a5aeb8c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/sequence.png differ
diff --git a/Dashboard/Resources/PlanIcons/sequence_project.png b/Dashboard/Resources/PlanIcons/sequence_project.png
new file mode 100644
index 00000000..29dc7b89
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/sequence_project.png differ
diff --git a/Dashboard/Resources/PlanIcons/set_function.png b/Dashboard/Resources/PlanIcons/set_function.png
new file mode 100644
index 00000000..7272565f
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/set_function.png differ
diff --git a/Dashboard/Resources/PlanIcons/shuffle.png b/Dashboard/Resources/PlanIcons/shuffle.png
new file mode 100644
index 00000000..dafa5383
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/shuffle.png differ
diff --git a/Dashboard/Resources/PlanIcons/single_source_round_robin.png b/Dashboard/Resources/PlanIcons/single_source_round_robin.png
new file mode 100644
index 00000000..e77bd9fa
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/single_source_round_robin.png differ
diff --git a/Dashboard/Resources/PlanIcons/single_source_shuffle.png b/Dashboard/Resources/PlanIcons/single_source_shuffle.png
new file mode 100644
index 00000000..f8b27a70
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/single_source_shuffle.png differ
diff --git a/Dashboard/Resources/PlanIcons/snapshot.png b/Dashboard/Resources/PlanIcons/snapshot.png
new file mode 100644
index 00000000..110e1912
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/snapshot.png differ
diff --git a/Dashboard/Resources/PlanIcons/sort.png b/Dashboard/Resources/PlanIcons/sort.png
new file mode 100644
index 00000000..5d36843d
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/sort.png differ
diff --git a/Dashboard/Resources/PlanIcons/split.png b/Dashboard/Resources/PlanIcons/split.png
new file mode 100644
index 00000000..37c6369d
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/split.png differ
diff --git a/Dashboard/Resources/PlanIcons/spool.png b/Dashboard/Resources/PlanIcons/spool.png
new file mode 100644
index 00000000..cc2a20d0
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/spool.png differ
diff --git a/Dashboard/Resources/PlanIcons/sql.png b/Dashboard/Resources/PlanIcons/sql.png
new file mode 100644
index 00000000..112e580a
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/sql.png differ
diff --git a/Dashboard/Resources/PlanIcons/stream_aggregate.png b/Dashboard/Resources/PlanIcons/stream_aggregate.png
new file mode 100644
index 00000000..04285c1a
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/stream_aggregate.png differ
diff --git a/Dashboard/Resources/PlanIcons/switch.png b/Dashboard/Resources/PlanIcons/switch.png
new file mode 100644
index 00000000..20d342a8
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/switch.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_delete.png b/Dashboard/Resources/PlanIcons/table_delete.png
new file mode 100644
index 00000000..09ee8625
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_delete.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_insert.png b/Dashboard/Resources/PlanIcons/table_insert.png
new file mode 100644
index 00000000..3b515fda
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_insert.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_merge.png b/Dashboard/Resources/PlanIcons/table_merge.png
new file mode 100644
index 00000000..f390461b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_merge.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_scan.png b/Dashboard/Resources/PlanIcons/table_scan.png
new file mode 100644
index 00000000..ad807feb
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_scan.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_spool.png b/Dashboard/Resources/PlanIcons/table_spool.png
new file mode 100644
index 00000000..3ba8e7cb
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_spool.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_update.png b/Dashboard/Resources/PlanIcons/table_update.png
new file mode 100644
index 00000000..171bc4f9
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_update.png differ
diff --git a/Dashboard/Resources/PlanIcons/table_valued_function.png b/Dashboard/Resources/PlanIcons/table_valued_function.png
new file mode 100644
index 00000000..6969e595
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/table_valued_function.png differ
diff --git a/Dashboard/Resources/PlanIcons/top.png b/Dashboard/Resources/PlanIcons/top.png
new file mode 100644
index 00000000..e47f1221
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/top.png differ
diff --git a/Dashboard/Resources/PlanIcons/trim.png b/Dashboard/Resources/PlanIcons/trim.png
new file mode 100644
index 00000000..b398045f
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/trim.png differ
diff --git a/Dashboard/Resources/PlanIcons/udx.png b/Dashboard/Resources/PlanIcons/udx.png
new file mode 100644
index 00000000..59b331ee
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/udx.png differ
diff --git a/Dashboard/Resources/PlanIcons/union.png b/Dashboard/Resources/PlanIcons/union.png
new file mode 100644
index 00000000..4bf96a9d
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/union.png differ
diff --git a/Dashboard/Resources/PlanIcons/union_all.png b/Dashboard/Resources/PlanIcons/union_all.png
new file mode 100644
index 00000000..d1996475
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/union_all.png differ
diff --git a/Dashboard/Resources/PlanIcons/update.png b/Dashboard/Resources/PlanIcons/update.png
new file mode 100644
index 00000000..ea13c72b
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/update.png differ
diff --git a/Dashboard/Resources/PlanIcons/window_aggregate.png b/Dashboard/Resources/PlanIcons/window_aggregate.png
new file mode 100644
index 00000000..9f2f161c
Binary files /dev/null and b/Dashboard/Resources/PlanIcons/window_aggregate.png differ
diff --git a/Dashboard/ServerTab.xaml b/Dashboard/ServerTab.xaml
index 526137c9..c9bffc01 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -234,369 +234,105 @@
                         <controls:CurrentConfigContent x:Name="CurrentConfigTab" />
                     </TabItem>
 
-                    <!-- Server Configuration Changes Sub-Tab -->
-                    <TabItem Header="Server Config Changes">
-                        <Grid>
-                        <DataGrid x:Name="ServerConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                                      RowStyle="{StaticResource DefaultRowStyle}"
-                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding ConfigurationName}" Width="200">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ConfigurationName" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Configuration" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding OldValueConfigured}" Width="110">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Old Configured" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewValueConfigured}" Width="110">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New Configured" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding OldValueInUse}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Old In Use" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewValueInUse}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New In Use" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding RequiresRestart}" Width="80">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Restart?" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="ServerConfigChangesRestartFilterCombo" Width="70" Height="22" FontSize="11"
-                                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="RequiresRestart">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsDynamic}" Width="70">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Dynamic" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="ServerConfigChangesDynamicFilterCombo" Width="60" Height="22" FontSize="11"
-                                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsDynamic">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsAdvanced}" Width="70">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Advanced" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="ServerConfigChangesAdvancedFilterCombo" Width="60" Height="22" FontSize="11"
-                                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsAdvanced">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="250">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Description}" Width="*">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Description" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Setting Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="ServerConfigChangesNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
-                    </TabItem>
-
-                    <!-- Database Configuration Changes Sub-Tab -->
-                    <TabItem Header="Database Config Changes">
-                        <Grid>
-                        <DataGrid x:Name="DatabaseConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                                      RowStyle="{StaticResource DefaultRowStyle}"
-                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding SettingType}" Width="120">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingType" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Setting Type" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding SettingName}" Width="200">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Setting Name" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding OldValue}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Old Value" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewValue}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New Value" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="DatabaseConfigChangesNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
-                    </TabItem>
-
-                    <!-- Trace Flag Changes Sub-Tab -->
-                    <TabItem Header="Trace Flag Changes">
-                        <Grid>
-                        <DataGrid x:Name="TraceFlagChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                                      RowStyle="{StaticResource DefaultRowStyle}"
-                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TraceFlag}" Width="90">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Trace Flag" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding PreviousStatus}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PreviousStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Previous Status" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewStatus}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New Status" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Scope}" Width="80">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Scope" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Scope" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsGlobal}" Width="80">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Global" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="TraceFlagChangesGlobalFilterCombo" Width="70" Height="22" FontSize="11"
-                                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsGlobal">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsSession}" Width="80">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Session" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="TraceFlagChangesSessionFilterCombo" Width="70" Height="22" FontSize="11"
-                                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsSession">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="TraceFlagChangesNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
+                    <!-- Configuration Changes Sub-Tab -->
+                    <TabItem Header="Configuration Changes">
+                        <controls:ConfigChangesContent x:Name="ConfigChangesTab" />
                     </TabItem>
 
                     <!-- Collection Health Sub-Tab -->
                     <TabItem Header="Collection Health">
-                        <Grid>
-                        <DataGrid x:Name="HealthDataGrid"
-                                      RowStyle="{StaticResource HealthRowStyle}"
-                                      AutoGenerateColumns="False"
-                                      IsReadOnly="True"
-                                      CanUserSortColumns="True"
-
-                                      GridLinesVisibility="All" CanUserResizeColumns="True"
-                                      MouseDoubleClick="HealthDataGrid_MouseDoubleClick">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding CollectorName}" Width="250">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding HealthStatus}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HealthStatus" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding HoursSinceSuccess}" Width="120">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HoursSinceSuccess" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Hours Since Success" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding LastSuccessTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastSuccessTime" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Last Success" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat='{}{0:F2}%'}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailureRatePercent" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Failure %" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalRuns7d, StringFormat='{}{0:N0}'}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRuns7d" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Runs (7d)" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding FailedRuns7d, StringFormat='{}{0:N0}'}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailedRuns7d" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Failed (7d)" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat='{}{0:N0}'}" Width="120">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationMs" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalRowsCollected7d, StringFormat='{}{0:N0}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRowsCollected7d" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Rows Collected (7d)" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="HealthNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
+                        <TabControl>
+                            <TabItem Header="Health Summary">
+                                <Grid>
+                                    <DataGrid x:Name="HealthDataGrid"
+                                              RowStyle="{StaticResource HealthRowStyle}"
+                                              AutoGenerateColumns="False"
+                                              IsReadOnly="True"
+                                              CanUserSortColumns="True"
+                                              GridLinesVisibility="All" CanUserResizeColumns="True"
+                                              MouseDoubleClick="HealthDataGrid_MouseDoubleClick">
+                                        <DataGrid.Columns>
+                                            <DataGridTextColumn Binding="{Binding CollectorName}" Width="250">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding HealthStatus}" Width="100">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HealthStatus" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding HoursSinceSuccess}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HoursSinceSuccess" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Hours Since Success" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding LastSuccessTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastSuccessTime" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Last Success" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat='{}{0:F2}%'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailureRatePercent" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Failure %" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding TotalRuns7d, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRuns7d" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Runs (7d)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding FailedRuns7d, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailedRuns7d" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Failed (7d)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationMs" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                            <DataGridTextColumn Binding="{Binding TotalRowsCollected7d, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="150">
+                                                <DataGridTextColumn.Header>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRowsCollected7d" Click="CollectionHealthFilter_Click" Margin="0,0,4,0"/>
+                                                        <TextBlock Text="Rows Collected (7d)" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                </DataGridTextColumn.Header>
+                                            </DataGridTextColumn>
+                                        </DataGrid.Columns>
+                                    </DataGrid>
+                                    <TextBlock x:Name="HealthNoDataMessage" Style="{StaticResource NoDataMessage}"/>
+                                </Grid>
+                            </TabItem>
+                            <TabItem Header="Duration Trends">
+                                <ScottPlot:WpfPlot x:Name="CollectorDurationChart" Margin="4"/>
+                            </TabItem>
+                        </TabControl>
                     </TabItem>
 
                     <!-- Running Jobs Sub-Tab -->
@@ -636,12 +372,12 @@
                                             <TextBlock Text="Avg Duration" FontWeight="Bold"/>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding P95DurationSeconds, StringFormat='{}{0:N0}s'}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding P95DurationSeconds, StringFormat='{}{0:N0}s'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header>
                                             <TextBlock Text="P95 Duration" FontWeight="Bold"/>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding PercentOfAverage, StringFormat='{}{0:N0}%'}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding PercentOfAverage, StringFormat='{}{0:N0}%'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header>
                                             <TextBlock Text="% of Average" FontWeight="Bold"/>
                                         </DataGridTextColumn.Header>
@@ -651,7 +387,7 @@
                                             <TextBlock Text="Running Long" FontWeight="Bold"/>
                                         </DataGridCheckBoxColumn.Header>
                                     </DataGridCheckBoxColumn>
-                                    <DataGridTextColumn Binding="{Binding SuccessfulRunCount, StringFormat='{}{0:N0}'}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding SuccessfulRunCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header>
                                             <TextBlock Text="History Runs" FontWeight="Bold"/>
                                         </DataGridTextColumn.Header>
@@ -674,6 +410,31 @@
                 <controls:QueryPerformanceContent x:Name="PerformanceTab"/>
             </TabItem>
 
+            <!-- Plan Viewer Tab -->
+            <TabItem Header="Plan Viewer" x:Name="PlanViewerTabItem">
+                <Grid>
+                    <StackPanel x:Name="PlanEmptyState" HorizontalAlignment="Center"
+                                VerticalAlignment="Center">
+                        <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
+                                   Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
+                        <TextBlock Text="Right-click a query row and choose 'View Plan' or 'Get Actual Plan'"
+                                   FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
+                                   HorizontalAlignment="Center" Margin="0,8,0,0"/>
+                    </StackPanel>
+                    <StackPanel x:Name="PlanLoadingState" HorizontalAlignment="Center"
+                                VerticalAlignment="Center" Visibility="Collapsed">
+                        <ProgressBar IsIndeterminate="True" Width="200" Height="4" Margin="0,0,0,12"/>
+                        <TextBlock x:Name="PlanLoadingLabel" Text="Executing query for actual plan..."
+                                   FontSize="14" Foreground="{DynamicResource ForegroundMutedBrush}"
+                                   HorizontalAlignment="Center"/>
+                        <Button x:Name="CancelPlanButton" Content="Cancel" Click="CancelPlanButton_Click"
+                                HorizontalAlignment="Center" Margin="0,12,0,0" Padding="16,4"/>
+                    </StackPanel>
+                    <TabControl x:Name="PlanTabControl" Visibility="Collapsed"
+                                Background="Transparent"/>
+                </Grid>
+            </TabItem>
+
             <!-- Resource Metrics Tab -->
             <TabItem x:Name="ResourceMetricsTabItem">
                 <TabItem.Header>
@@ -789,11 +550,43 @@
                         </Grid>
                     </TabItem>
 
+                    <!-- Current Waits Sub-Tab -->
+                    <TabItem Header="Current Waits">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <Border Grid.Row="0" BorderBrush="LightGray" BorderThickness="1" Margin="5,5,5,2">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Grid.Row="0" Text="Wait Duration by Wait Type" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                    <ScottPlot:WpfPlot Grid.Row="1" x:Name="CurrentWaitsDurationChart"/>
+                                </Grid>
+                            </Border>
+
+                            <Border Grid.Row="1" BorderBrush="LightGray" BorderThickness="1" Margin="5,2,5,5">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Grid.Row="0" Text="Blocked Sessions by Database" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                    <ScottPlot:WpfPlot Grid.Row="1" x:Name="CurrentWaitsBlockedChart"/>
+                                </Grid>
+                            </Border>
+                        </Grid>
+                    </TabItem>
+
                     <!-- Blocking Sub-Tab -->
                     <TabItem Header="Blocking">
                         <Grid>
                         <DataGrid x:Name="BlockingEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                                      GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
                                       RowStyle="{StaticResource DefaultRowStyle}"
                                       ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
                                 <DataGrid.Columns>
@@ -813,7 +606,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Spid, StringFormat='{}{0:N0}'}" Width="50">
+                                    <DataGridTextColumn Binding="{Binding Spid, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="50">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Spid" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -845,7 +638,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding WaitTimeMs, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding WaitTimeMs, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitTimeMs" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -909,14 +702,19 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding QueryText}" Width="300">
-                                        <DataGridTextColumn.Header>
+                                    <DataGridTemplateColumn Width="300">
+                                        <DataGridTemplateColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
                                                 <TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/>
                                             </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
+                                        </DataGridTemplateColumn.Header>
+                                        <DataGridTemplateColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <TextBlock Text="{Binding QueryText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding QueryText}"/>
+                                            </DataTemplate>
+                                        </DataGridTemplateColumn.CellTemplate>
+                                    </DataGridTemplateColumn>
                                     <DataGridTextColumn Binding="{Binding TransactionName}" Width="100">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
@@ -925,7 +723,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TransactionCount, StringFormat='{}{0:N0}'}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding TransactionCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TransactionCount" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -933,7 +731,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Priority, StringFormat='{}{0:N0}'}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding Priority, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Priority" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -941,7 +739,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding LogUsed, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding LogUsed, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LogUsed" Click="BlockingEventsFilter_Click" Margin="0,0,4,0"/>
@@ -1005,7 +803,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Spid, StringFormat='{}{0:N0}'}" Width="50">
+                                    <DataGridTextColumn Binding="{Binding Spid, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="50">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Spid" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
@@ -1021,7 +819,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding WaitTime, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding WaitTime, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitTime" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
@@ -1117,7 +915,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TransactionCount, StringFormat='{}{0:N0}'}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding TransactionCount, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TransactionCount" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
@@ -1125,7 +923,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Priority, StringFormat='{}{0:N0}'}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding Priority, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Priority" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
@@ -1133,7 +931,7 @@
                                             </StackPanel>
                                         </DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding LogUsed, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding LogUsed, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LogUsed" Click="DeadlocksFilter_Click" Margin="0,0,4,0"/>
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 5c849416..027631bc 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -49,14 +49,6 @@ public partial class ServerTab : UserControl
         private bool _isRefreshing;
 
         // Filter state dictionaries for each DataGrid
-        private Dictionary<string, ColumnFilterState> _serverConfigChangesFilters = new();
-        private List<ServerConfigChangeItem>? _serverConfigChangesUnfilteredData;
-
-        private Dictionary<string, ColumnFilterState> _dbConfigChangesFilters = new();
-        private List<DatabaseConfigChangeItem>? _dbConfigChangesUnfilteredData;
-
-        private Dictionary<string, ColumnFilterState> _traceFlagChangesFilters = new();
-        private List<TraceFlagChangeItem>? _traceFlagChangesUnfilteredData;
 
         private Dictionary<string, ColumnFilterState> _collectionHealthFilters = new();
         private List<CollectionHealthItem>? _collectionHealthUnfilteredData;
@@ -86,6 +78,9 @@ public partial class ServerTab : UserControl
         private Helpers.ChartHoverHelper? _blockingDurationHover;
         private Helpers.ChartHoverHelper? _deadlocksHover;
         private Helpers.ChartHoverHelper? _deadlockWaitTimeHover;
+        private Helpers.ChartHoverHelper? _collectorDurationHover;
+        private Helpers.ChartHoverHelper? _currentWaitsDurationHover;
+        private Helpers.ChartHoverHelper? _currentWaitsBlockedHover;
 
         public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
         {
@@ -100,6 +95,9 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             _blockingDurationHover = new Helpers.ChartHoverHelper(BlockingStatsDurationChart, "ms");
             _deadlocksHover = new Helpers.ChartHoverHelper(BlockingStatsDeadlocksChart, "events");
             _deadlockWaitTimeHover = new Helpers.ChartHoverHelper(BlockingStatsDeadlockWaitTimeChart, "ms");
+            _collectorDurationHover = new Helpers.ChartHoverHelper(CollectorDurationChart, "ms");
+            _currentWaitsDurationHover = new Helpers.ChartHoverHelper(CurrentWaitsDurationChart, "ms");
+            _currentWaitsBlockedHover = new Helpers.ChartHoverHelper(CurrentWaitsBlockedChart, "sessions");
 
             _serverConnection = serverConnection;
             UtcOffsetMinutes = utcOffsetMinutes;
@@ -122,8 +120,22 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             CriticalIssuesTab.Initialize(_databaseService);
             DefaultTraceTab.Initialize(_databaseService);
             CurrentConfigTab.Initialize(_databaseService);
+            ConfigChangesTab.Initialize(_databaseService);
             MemoryTab.Initialize(_databaseService);
             PerformanceTab.Initialize(_databaseService, s => StatusText.Text = s);
+            PerformanceTab.ViewPlanRequested += (planXml, label, queryText) =>
+            {
+                OpenPlanTab(planXml, label, queryText);
+                PlanViewerTabItem.IsSelected = true;
+            };
+            PerformanceTab.ActualPlanStarted += (label) =>
+            {
+                ShowPlanLoading(label);
+            };
+            PerformanceTab.ActualPlanFinished += () =>
+            {
+                HidePlanLoading();
+            };
             SystemEventsContent.Initialize(_databaseService);
             ResourceMetricsContent.Initialize(_databaseService);
 
@@ -132,6 +144,71 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             CriticalIssuesTab.SetTimeRange(prefs.DefaultHoursBack);
         }
 
+        private void ShowPlanLoading(string label)
+        {
+            PlanLoadingLabel.Text = $"Executing: {label}";
+            PlanEmptyState.Visibility = Visibility.Collapsed;
+            PlanTabControl.Visibility = Visibility.Collapsed;
+            PlanLoadingState.Visibility = Visibility.Visible;
+            PlanViewerTabItem.IsSelected = true;
+        }
+
+        private void HidePlanLoading()
+        {
+            PlanLoadingState.Visibility = Visibility.Collapsed;
+            if (PlanTabControl.Items.Count > 0)
+                PlanTabControl.Visibility = Visibility.Visible;
+            else
+                PlanEmptyState.Visibility = Visibility.Visible;
+        }
+
+        private void CancelPlanButton_Click(object sender, RoutedEventArgs e)
+        {
+            PerformanceTab.CancelActualPlan();
+        }
+
+        private void OpenPlanTab(string planXml, string label, string? queryText = null)
+        {
+            HidePlanLoading();
+            var viewer = new Controls.PlanViewerControl();
+            viewer.LoadPlan(planXml, label, queryText);
+
+            var header = new StackPanel { Orientation = Orientation.Horizontal };
+            header.Children.Add(new TextBlock
+            {
+                Text = label.Length > 30 ? label[..30] + "\u2026" : label,
+                VerticalAlignment = VerticalAlignment.Center,
+                ToolTip = label
+            });
+            var closeBtn = new Button
+            {
+                Style = (Style)FindResource("TabCloseButton")
+            };
+            header.Children.Add(closeBtn);
+
+            var tab = new TabItem { Header = header, Content = viewer };
+            closeBtn.Tag = tab;
+            closeBtn.Click += ClosePlanTab_Click;
+
+            PlanTabControl.Items.Add(tab);
+            PlanTabControl.SelectedItem = tab;
+            PlanEmptyState.Visibility = Visibility.Collapsed;
+            PlanTabControl.Visibility = Visibility.Visible;
+        }
+
+        private void ClosePlanTab_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button btn && btn.Tag is TabItem tab)
+            {
+                PlanTabControl.Items.Remove(tab);
+                if (PlanTabControl.Items.Count == 0)
+                {
+                    PlanTabControl.Visibility = Visibility.Collapsed;
+                    PlanEmptyState.Visibility = Visibility.Visible;
+                }
+            }
+        }
+
         private void InitializeDefaultTimeRanges()
         {
             var prefs = _preferencesService.GetPreferences();
@@ -154,9 +231,7 @@ private void InitializeDefaultTimeRanges()
             _blockingStatsHoursBack = defaultHours;
             // Performance tab state variables now managed by QueryPerformanceContent UserControl
             // Memory state variables now managed by MemoryContent UserControl
-            _serverConfigChangesHoursBack = defaultHours;
-            _dbConfigChangesHoursBack = defaultHours;
-            _traceFlagChangesHoursBack = defaultHours;
+            ConfigChangesTab.SetTimeRange(defaultHours, null, null);
             // _sessionStatsHoursBack and _queryPerfTrendsHoursBack now managed by QueryPerformanceContent UserControl
             // _criticalIssuesHoursBack now managed by CriticalIssuesTab UserControl
             // System Health/HealthParser state now managed by SystemEventsContent UserControl
@@ -382,17 +457,21 @@ private async void ServerTab_KeyDown(object sender, System.Windows.Input.KeyEven
         private void SetupChartContextMenus()
         {
             // Resource Overview charts
-            SetupChartSaveMenu(ResourceOverviewCpuChart, "CPU_Utilization", "collect.cpu_utilization_stats");
-            SetupChartSaveMenu(ResourceOverviewMemoryChart, "Memory_Utilization", "collect.memory_stats");
-            SetupChartSaveMenu(ResourceOverviewIoChart, "IO_Latency", "collect.file_io_stats");
-            SetupChartSaveMenu(ResourceOverviewWaitChart, "Wait_Stats", "collect.wait_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(ResourceOverviewCpuChart, "CPU_Utilization", "collect.cpu_utilization_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(ResourceOverviewMemoryChart, "Memory_Utilization", "collect.memory_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(ResourceOverviewIoChart, "IO_Latency", "collect.file_io_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(ResourceOverviewWaitChart, "Wait_Stats", "collect.wait_stats");
 
             // Blocking Stats charts
-            SetupChartSaveMenu(LockWaitStatsChart, "Lock_Wait_Stats", "collect.wait_stats");
-            SetupChartSaveMenu(BlockingStatsBlockingEventsChart, "Blocking_Events", "collect.blocking_deadlock_stats");
-            SetupChartSaveMenu(BlockingStatsDurationChart, "Blocking_Duration", "collect.blocking_deadlock_stats");
-            SetupChartSaveMenu(BlockingStatsDeadlocksChart, "Deadlocks", "collect.blocking_deadlock_stats");
-            SetupChartSaveMenu(BlockingStatsDeadlockWaitTimeChart, "Deadlock_Wait_Time", "collect.blocking_deadlock_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(LockWaitStatsChart, "Lock_Wait_Stats", "collect.wait_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(BlockingStatsBlockingEventsChart, "Blocking_Events", "collect.blocking_deadlock_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(BlockingStatsDurationChart, "Blocking_Duration", "collect.blocking_deadlock_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(BlockingStatsDeadlocksChart, "Deadlocks", "collect.blocking_deadlock_stats");
+            Helpers.TabHelpers.SetupChartContextMenu(BlockingStatsDeadlockWaitTimeChart, "Deadlock_Wait_Time", "collect.blocking_deadlock_stats");
+
+            // Current Waits charts
+            Helpers.TabHelpers.SetupChartContextMenu(CurrentWaitsDurationChart, "Current_Waits_Duration", "collect.waiting_tasks");
+            Helpers.TabHelpers.SetupChartContextMenu(CurrentWaitsBlockedChart, "Current_Waits_Blocked", "collect.waiting_tasks");
 
             // Query Performance Trends charts now handled by QueryPerformanceContent UserControl
 
@@ -402,295 +481,16 @@ private void SetupChartContextMenus()
             // Memory Analysis charts now handled by MemoryContent UserControl
         }
 
-        private void SetupChartSaveMenu(WpfPlot chart, string chartName, string? dataSource = null)
-        {
-            // Create native WPF context menu (simpler - no zoom items since double-click handles reset)
-            var contextMenu = new ContextMenu();
-
-            var copyItem = new MenuItem { Header = "Copy Image", Icon = new TextBlock { Text = "📋" } };
-            copyItem.Click += (s, e) =>
-            {
-                var tempFile = Path.Combine(Path.GetTempPath(), $"chart_copy_{Guid.NewGuid()}.png");
-                try
-                {
-                    chart.Plot.SavePng(tempFile, (int)chart.ActualWidth, (int)chart.ActualHeight);
-                    var bitmap = new System.Windows.Media.Imaging.BitmapImage();
-                    bitmap.BeginInit();
-                    bitmap.CacheOption = System.Windows.Media.Imaging.BitmapCacheOption.OnLoad;
-                    bitmap.UriSource = new Uri(tempFile);
-                    bitmap.EndInit();
-                    bitmap.Freeze();
-                    /* Use SetDataObject with copy=false to avoid WPF's problematic Clipboard.Flush() */
-                    Clipboard.SetDataObject(new System.Windows.DataObject(System.Windows.DataFormats.Bitmap, bitmap), false);
-                }
-                finally
-                {
-                    if (File.Exists(tempFile)) File.Delete(tempFile);
-                }
-            };
-            contextMenu.Items.Add(copyItem);
-
-            var saveItem = new MenuItem { Header = "Save Image As...", Icon = new TextBlock { Text = "💾" } };
-            saveItem.Click += (s, e) =>
-            {
-                var timestamp = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss", CultureInfo.InvariantCulture);
-                var defaultFileName = $"{chartName}_{timestamp}.png";
-                var saveDialog = new SaveFileDialog
-                {
-                    Filter = "PNG Image|*.png|JPEG Image|*.jpg|BMP Image|*.bmp",
-                    FileName = defaultFileName,
-                    DefaultExt = ".png"
-                };
-                if (saveDialog.ShowDialog() == true)
-                {
-                    chart.Plot.SavePng(saveDialog.FileName, (int)chart.ActualWidth, (int)chart.ActualHeight);
-                }
-            };
-            contextMenu.Items.Add(saveItem);
-
-            var openWindowItem = new MenuItem { Header = "Open in New Window", Icon = new TextBlock { Text = "🗗" } };
-            openWindowItem.Click += (s, e) =>
-            {
-                var newWindow = new Window
-                {
-                    Title = chartName.Replace("_", " ", StringComparison.Ordinal),
-                    Width = 800,
-                    Height = 600
-                };
-                var tempFile = Path.Combine(Path.GetTempPath(), $"chart_temp_{Guid.NewGuid()}.png");
-                try
-                {
-                    chart.Plot.SavePng(tempFile, 800, 600);
-                    var image = new System.Windows.Controls.Image();
-                    var bitmap = new System.Windows.Media.Imaging.BitmapImage();
-                    bitmap.BeginInit();
-                    bitmap.CacheOption = System.Windows.Media.Imaging.BitmapCacheOption.OnLoad;
-                    bitmap.UriSource = new Uri(tempFile);
-                    bitmap.EndInit();
-                    bitmap.Freeze();
-                    image.Source = bitmap;
-                    newWindow.Content = image;
-                }
-                finally
-                {
-                    if (File.Exists(tempFile)) File.Delete(tempFile);
-                }
-                newWindow.Show();
-            };
-            contextMenu.Items.Add(openWindowItem);
-
-            contextMenu.Items.Add(new Separator());
-
-            var autoscaleItem = new MenuItem { Header = "Revert (or double-click)", Icon = new TextBlock { Text = "↩" } };
-            autoscaleItem.Click += (s, e) =>
-            {
-                chart.Plot.Axes.AutoScale();
-                chart.Refresh();
-            };
-            contextMenu.Items.Add(autoscaleItem);
-
-            contextMenu.Items.Add(new Separator());
-
-            var exportCsvItem = new MenuItem { Header = "Export Data to CSV...", Icon = new TextBlock { Text = "📊" } };
-            exportCsvItem.Click += (s, e) =>
-            {
-                var timestamp = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss", CultureInfo.InvariantCulture);
-                var defaultFileName = $"{chartName}_data_{timestamp}.csv";
-                var saveDialog = new SaveFileDialog
-                {
-                    Filter = "CSV Files|*.csv|All Files|*.*",
-                    FileName = defaultFileName,
-                    DefaultExt = ".csv"
-                };
-                if (saveDialog.ShowDialog() == true)
-                {
-                    try
-                    {
-                        var sb = new StringBuilder();
-                        sb.AppendLine("DateTime,Series,Value");
-
-                        var plottables = chart.Plot.GetPlottables();
-                        int seriesIndex = 1;
-                        foreach (var plottable in plottables)
-                        {
-                            if (plottable is ScottPlot.Plottables.Scatter scatter)
-                            {
-                                var seriesName = scatter.LegendText ?? $"Series{seriesIndex}";
-                                var points = scatter.Data.GetScatterPoints();
-
-                                foreach (var point in points)
-                                {
-                                    var dateTime = DateTime.FromOADate(point.X);
-                                    sb.AppendLine(CultureInfo.InvariantCulture, $"{dateTime:yyyy-MM-dd HH:mm:ss},{TabHelpers.EscapeCsvField(seriesName)},{point.Y}");
-                                }
-                                seriesIndex++;
-                            }
-                        }
-
-                        File.WriteAllText(saveDialog.FileName, sb.ToString());
-                        MessageBox.Show($"Data exported to:\n{saveDialog.FileName}", "Export Complete", MessageBoxButton.OK, MessageBoxImage.Information);
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show($"Error exporting data:\n\n{ex.Message}", "Export Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                }
-            };
-            contextMenu.Items.Add(exportCsvItem);
-
-            // Show Data Source (if provided)
-            if (!string.IsNullOrEmpty(dataSource))
-            {
-                contextMenu.Items.Add(new Separator());
-
-                var dataSourceItem = new MenuItem { Header = "Show Data Source", Icon = new TextBlock { Text = "ℹ" } };
-                dataSourceItem.Click += (s, e) =>
-                {
-                    MessageBox.Show(
-                        $"Data Source:\n\n{dataSource}",
-                        "Chart Data Source",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Information);
-                };
-                contextMenu.Items.Add(dataSourceItem);
-            }
-
-            // Disable ScottPlot's default right-click context menu handling
-            chart.UserInputProcessor.UserActionResponses.RemoveAll(r =>
-                r.GetType().Name.Contains("Context", StringComparison.Ordinal) ||
-                r.GetType().Name.Contains("RightClick", StringComparison.Ordinal) ||
-                r.GetType().Name.Contains("Menu", StringComparison.Ordinal));
-
-            // Use PreviewMouseRightButtonDown to show context menu before ScottPlot handles it
-            chart.PreviewMouseRightButtonDown += (s, e) =>
-            {
-                e.Handled = true; // Prevent ScottPlot from handling
-                contextMenu.PlacementTarget = chart;
-                contextMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.MousePoint;
-                contextMenu.IsOpen = true;
-            };
-
-            // Disable ALL of ScottPlot's default double-click behaviors
-            chart.UserInputProcessor.UserActionResponses.RemoveAll(r =>
-                r.GetType().Name.Contains("DoubleClick", StringComparison.Ordinal));
-
-            // Use PreviewMouseDoubleClick to intercept before ScottPlot
-            chart.PreviewMouseDoubleClick += (s, e) =>
-            {
-                e.Handled = true;
-                _isAutoScaling = true;
-
-                Dispatcher.BeginInvoke(new Action(async () =>
-                {
-                    try
-                    {
-                        if (_isZoomed)
-                        {
-                            await ResetToOriginalRange();
-                        }
-                        else
-                        {
-                            chart.Plot.Axes.AutoScale();
-                            chart.Refresh();
-                        }
-                    }
-                    finally
-                    {
-                        await Task.Delay(200);
-                        _isAutoScaling = false;
-                    }
-                }), System.Windows.Threading.DispatcherPriority.Background);
-            };
-
-            // Add AxisLimitsChanged handler for auto-zoom-out detection
-            chart.Plot.RenderManager.AxisLimitsChanged += (s, e) =>
-            {
-                if (_isApplyingZoom || _isAutoScaling) return; // Avoid recursion
-
-                // Debounce - reset timer on each change
-                _lastZoomedChart = chart;
-
-                if (_chartZoomDebounceTimer == null)
-                {
-                    _chartZoomDebounceTimer = new DispatcherTimer
-                    {
-                        Interval = TimeSpan.FromMilliseconds(800)
-                    };
-                    _chartZoomDebounceTimer.Tick += ChartZoomDebounce_Tick;
-                }
-
-                _chartZoomDebounceTimer.Stop();
-                _chartZoomDebounceTimer.Start();
-            };
-        }
-
-        private async void ChartZoomDebounce_Tick(object? sender, EventArgs e)
-        {
-            _chartZoomDebounceTimer?.Stop();
-
-            if (_lastZoomedChart == null || _isApplyingZoom) return;
-
-            try
-            {
-                var limits = _lastZoomedChart.Plot.Axes.GetLimits();
-                var fromDate = DateTime.FromOADate(limits.Left);
-                var toDate = DateTime.FromOADate(limits.Right);
-
-                // Validate dates
-                if (fromDate >= toDate || fromDate.Year < 2000 || toDate.Year > 2100)
-                    return;
-
-                // Get current data range
-                DateTime currentFrom, currentTo;
-                if (_globalFromDate.HasValue && _globalToDate.HasValue)
-                {
-                    currentFrom = _globalFromDate.Value;
-                    currentTo = _globalToDate.Value;
-                }
-                else
-                {
-                    currentTo = Helpers.ServerTimeHelper.ServerNow;
-                    currentFrom = currentTo.AddHours(-_globalHoursBack);
-                }
-
-                // Check if zoomed significantly beyond current data range (more than 10% wider)
-                var currentSpan = (currentTo - currentFrom).TotalMinutes;
-                var newSpan = (toDate - fromDate).TotalMinutes;
-
-                bool zoomedOut = fromDate < currentFrom.AddMinutes(-currentSpan * 0.1) ||
-                                 toDate > currentTo.AddMinutes(currentSpan * 0.1);
-
-                if (zoomedOut && newSpan > currentSpan * 1.1)
-                {
-                    // Auto-apply the zoomed-out range to fetch more data
-                    _isApplyingZoom = true;
-                    await ZoomToTimeRange(fromDate, toDate);
-                    _isApplyingZoom = false;
-                }
-            }
-            catch (Exception ex)
-            {
-                // Log but don't show error for zoom operations - they're non-critical
-                Logger.Warning($"Chart zoom error: {ex.Message}");
-            }
-        }
-
         private async void ServerTab_Loaded(object sender, RoutedEventArgs e)
         {
             try
             {
                 // Apply minimum column widths based on header text
-                Helpers.TabHelpers.AutoSizeColumnMinWidths(ServerConfigChangesDataGrid);
-                Helpers.TabHelpers.AutoSizeColumnMinWidths(DatabaseConfigChangesDataGrid);
-                Helpers.TabHelpers.AutoSizeColumnMinWidths(TraceFlagChangesDataGrid);
                 Helpers.TabHelpers.AutoSizeColumnMinWidths(HealthDataGrid);
                 Helpers.TabHelpers.AutoSizeColumnMinWidths(BlockingEventsDataGrid);
                 Helpers.TabHelpers.AutoSizeColumnMinWidths(DeadlocksDataGrid);
 
                 // Freeze identifier columns
-                Helpers.TabHelpers.FreezeColumns(ServerConfigChangesDataGrid, 1);
-                Helpers.TabHelpers.FreezeColumns(DatabaseConfigChangesDataGrid, 2);
-                Helpers.TabHelpers.FreezeColumns(TraceFlagChangesDataGrid, 1);
                 Helpers.TabHelpers.FreezeColumns(HealthDataGrid, 1);
                 Helpers.TabHelpers.FreezeColumns(BlockingEventsDataGrid, 1);
                 Helpers.TabHelpers.FreezeColumns(DeadlocksDataGrid, 1);
@@ -745,12 +545,6 @@ private async void RefreshButton_Click(object sender, RoutedEventArgs e)
         private DateTime? _originalToDate = null;
         private bool _isZoomed = false;
 
-        // Debounce timer for auto-applying chart zoom
-        private DispatcherTimer? _chartZoomDebounceTimer;
-        private WpfPlot? _lastZoomedChart;
-        private bool _isApplyingZoom = false;
-        private bool _isAutoScaling = false;
-
         private async void GlobalTimeRange_Click(object sender, RoutedEventArgs e)
         {
             try
@@ -1173,10 +967,12 @@ private async Task ApplyAndRefreshCurrentTabAsync()
                         _resourceOverviewToDate = _globalToDate;
                         CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+                        ConfigChangesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         CollectionHealth_Refresh_Click(null, new RoutedEventArgs());
                         await CriticalIssuesTab.RefreshDataAsync();
                         await DefaultTraceTab.RefreshAllDataAsync();
                         await CurrentConfigTab.RefreshAllDataAsync();
+                        await ConfigChangesTab.RefreshAllDataAsync();
                         await RefreshResourceOverviewAsync();
                         break;
 
@@ -1218,19 +1014,6 @@ private async Task ApplyAndRefreshCurrentTabAsync()
                         // System Events tab - HealthParser data is handled by SystemEventsContent UserControl
                         SystemEventsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         await SystemEventsContent.RefreshAllDataAsync();
-                        // Configuration sub-tabs (Server Config Changes, DB Config Changes, Trace Flags) are still in ServerTab
-                        _serverConfigChangesHoursBack = _globalHoursBack;
-                        _serverConfigChangesFromDate = _globalFromDate;
-                        _serverConfigChangesToDate = _globalToDate;
-                        _dbConfigChangesHoursBack = _globalHoursBack;
-                        _dbConfigChangesFromDate = _globalFromDate;
-                        _dbConfigChangesToDate = _globalToDate;
-                        _traceFlagChangesHoursBack = _globalHoursBack;
-                        _traceFlagChangesFromDate = _globalFromDate;
-                        _traceFlagChangesToDate = _globalToDate;
-                        ServerConfigChanges_Refresh_Click(null, new RoutedEventArgs());
-                        DatabaseConfigChanges_Refresh_Click(null, new RoutedEventArgs());
-                        TraceFlagChanges_Refresh_Click(null, new RoutedEventArgs());
                         break;
 
                     default:
@@ -1273,10 +1056,13 @@ private async Task LoadDataAsync()
 
                 // Fetch all data in parallel — overview queries + all tab refreshes
                 var healthTask = _databaseService.GetCollectionHealthAsync();
+                var durationLogsTask = _databaseService.GetCollectionDurationLogsAsync();
                 var blockingEventsTask = _databaseService.GetBlockingEventsAsync();
                 var deadlocksTask = _databaseService.GetDeadlocksAsync();
                 var blockingStatsTask = _databaseService.GetBlockingDeadlockStatsAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
                 var lockWaitStatsTask = _databaseService.GetLockWaitStatsAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                var currentWaitsDurationTask = _databaseService.GetWaitingTaskTrendAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                var currentWaitsBlockedTask = _databaseService.GetBlockedSessionTrendAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
 
                 var performanceTask = PerformanceTab.RefreshAllDataAsync();
                 var memoryTask = MemoryTab.RefreshAllDataAsync();
@@ -1287,13 +1073,14 @@ private async Task LoadDataAsync()
                 var criticalIssuesTask = CriticalIssuesTab.RefreshDataAsync();
                 var defaultTraceTask = DefaultTraceTab.RefreshAllDataAsync();
                 var currentConfigTask = CurrentConfigTab.RefreshAllDataAsync();
+                var configChangesTask = ConfigChangesTab.RefreshAllDataAsync();
                 var systemEventsTask = SystemEventsContent.RefreshAllDataAsync();
 
                 // Wait for everything to complete before _isRefreshing resets
                 await Task.WhenAll(
-                    healthTask, blockingEventsTask, deadlocksTask, blockingStatsTask, lockWaitStatsTask,
+                    healthTask, durationLogsTask, blockingEventsTask, deadlocksTask, blockingStatsTask, lockWaitStatsTask, currentWaitsDurationTask, currentWaitsBlockedTask,
                     performanceTask, memoryTask, resourceOverviewTask, runningJobsTask,
-                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, defaultTraceTask, currentConfigTask, systemEventsTask);
+                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, defaultTraceTask, currentConfigTask, configChangesTask, systemEventsTask);
 
                 // Populate grids with fetched data
                 var healthData = await healthTask;
@@ -1301,6 +1088,9 @@ await Task.WhenAll(
                 UpdateDataGridFilterButtonStyles(HealthDataGrid, _collectionHealthFilters);
                 HealthNoDataMessage.Visibility = healthData.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
 
+                var durationLogs = await durationLogsTask;
+                UpdateCollectorDurationChart(durationLogs);
+
                 try
                 {
                     var blockingEvents = await blockingEventsTask;
@@ -1331,6 +1121,10 @@ await Task.WhenAll(
                     var lockWaitStats = await lockWaitStatsTask;
                     LoadBlockingStatsCharts(blockingStats, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
                     LoadLockWaitStatsChart(lockWaitStats, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                    var currentWaitsDuration = await currentWaitsDurationTask;
+                    var currentWaitsBlocked = await currentWaitsBlockedTask;
+                    LoadCurrentWaitsDurationChart(currentWaitsDuration, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                    LoadCurrentWaitsBlockedChart(currentWaitsBlocked, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
                 }
                 catch (Exception blockingStatsEx)
                 {
@@ -1612,7 +1406,9 @@ private async void BlockingStats_Refresh_Click(object? sender, RoutedEventArgs e
 
                 var blockingStatsTask = _databaseService.GetBlockingDeadlockStatsAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
                 var lockWaitStatsTask = _databaseService.GetLockWaitStatsAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
-                await Task.WhenAll(blockingStatsTask, lockWaitStatsTask);
+                var currentWaitsDurationTask = _databaseService.GetWaitingTaskTrendAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                var currentWaitsBlockedTask = _databaseService.GetBlockedSessionTrendAsync(_blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                await Task.WhenAll(blockingStatsTask, lockWaitStatsTask, currentWaitsDurationTask, currentWaitsBlockedTask);
 
                 var data = await blockingStatsTask;
                 var lockWaitStats = await lockWaitStatsTask;
@@ -1620,6 +1416,8 @@ private async void BlockingStats_Refresh_Click(object? sender, RoutedEventArgs e
                 // Load charts with explicit time range for proper axis scaling
                 LoadBlockingStatsCharts(data, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
                 LoadLockWaitStatsChart(lockWaitStats, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                LoadCurrentWaitsDurationChart(await currentWaitsDurationTask, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
+                LoadCurrentWaitsBlockedChart(await currentWaitsBlockedTask, _blockingStatsHoursBack, _blockingStatsFromDate, _blockingStatsToDate);
                 StatusText.Text = $"Loaded {data.Count} blocking/deadlock stats records";
             }
             catch (Exception ex)
@@ -1765,6 +1563,55 @@ private void LoadBlockingStatsCharts(List<BlockingDeadlockStatsItem> data, int h
             BlockingStatsDeadlockWaitTimeChart.Refresh();
         }
 
+        private void UpdateCollectorDurationChart(List<CollectionLogEntry> data)
+        {
+            if (_legendPanels.TryGetValue(CollectorDurationChart, out var existingPanel) && existingPanel != null)
+            {
+                CollectorDurationChart.Plot.Axes.Remove(existingPanel);
+                _legendPanels[CollectorDurationChart] = null;
+            }
+            CollectorDurationChart.Plot.Clear();
+            _collectorDurationHover?.Clear();
+            ApplyDarkModeToChart(CollectorDurationChart);
+
+            if (data.Count == 0) { CollectorDurationChart.Refresh(); return; }
+
+            var groups = data
+                .Where(d => d.CollectorName != "scheduled_master_collector")
+                .GroupBy(d => d.CollectorName)
+                .OrderBy(g => g.Key)
+                .ToList();
+
+            var colors = TabHelpers.ChartColors;
+            int colorIndex = 0;
+            foreach (var group in groups)
+            {
+                var points = group.OrderBy(d => d.CollectionTime).ToList();
+                if (points.Count < 2) continue;
+
+                var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
+                    points.Select(d => d.CollectionTime),
+                    points.Select(d => (double)d.DurationMs));
+
+                var scatter = CollectorDurationChart.Plot.Add.Scatter(xs, ys);
+                scatter.LegendText = group.Key;
+                scatter.Color = colors[colorIndex % colors.Length];
+                scatter.LineWidth = 2;
+                scatter.MarkerSize = 0;
+                _collectorDurationHover?.Add(scatter, group.Key);
+                colorIndex++;
+            }
+
+            CollectorDurationChart.Plot.Axes.DateTimeTicksBottom();
+            TabHelpers.ReapplyAxisColors(CollectorDurationChart);
+            CollectorDurationChart.Plot.YLabel("Duration (ms)");
+            CollectorDurationChart.Plot.Axes.AutoScale();
+            _legendPanels[CollectorDurationChart] = CollectorDurationChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
+            CollectorDurationChart.Plot.Legend.FontSize = 12;
+            LockChartVerticalAxis(CollectorDurationChart);
+            CollectorDurationChart.Refresh();
+        }
+
         private void LoadLockWaitStatsChart(List<LockWaitStatsItem> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
         {
             // Calculate the time range for X-axis limits (use server time, not local time)
@@ -1827,6 +1674,120 @@ private void LoadLockWaitStatsChart(List<LockWaitStatsItem> data, int hoursBack,
             LockWaitStatsChart.Refresh();
         }
 
+        private void LoadCurrentWaitsDurationChart(List<WaitingTaskTrendItem> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+        {
+            DateTime rangeEnd = toDate ?? Helpers.ServerTimeHelper.ServerNow;
+            DateTime rangeStart = fromDate ?? rangeEnd.AddHours(-hoursBack);
+            double xMin = rangeStart.ToOADate();
+            double xMax = rangeEnd.ToOADate();
+
+            if (_legendPanels.TryGetValue(CurrentWaitsDurationChart, out var existingPanel) && existingPanel != null)
+            {
+                CurrentWaitsDurationChart.Plot.Axes.Remove(existingPanel);
+                _legendPanels[CurrentWaitsDurationChart] = null;
+            }
+            CurrentWaitsDurationChart.Plot.Clear();
+            _currentWaitsDurationHover?.Clear();
+            ApplyDarkModeToChart(CurrentWaitsDurationChart);
+
+            var waitTypes = data.Select(d => d.WaitType).Distinct().OrderBy(w => w).ToList();
+            var colors = TabHelpers.ChartColors;
+
+            int colorIndex = 0;
+            foreach (var waitType in waitTypes)
+            {
+                var waitTypeData = data.Where(d => d.WaitType == waitType).OrderBy(d => d.CollectionTime).ToList();
+                if (waitTypeData.Count > 0)
+                {
+                    var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
+                        waitTypeData.Select(d => d.CollectionTime),
+                        waitTypeData.Select(d => (double)d.TotalWaitMs));
+
+                    var scatter = CurrentWaitsDurationChart.Plot.Add.Scatter(xs, ys);
+                    scatter.LineWidth = 2;
+                    scatter.MarkerSize = 5;
+                    scatter.Color = colors[colorIndex % colors.Length];
+                    scatter.LegendText = waitType;
+                    _currentWaitsDurationHover?.Add(scatter, waitType);
+                    colorIndex++;
+                }
+            }
+
+            if (data.Count == 0)
+            {
+                double xCenter = xMin + (xMax - xMin) / 2;
+                var noDataText = CurrentWaitsDurationChart.Plot.Add.Text("No data for selected time range", xCenter, 0.5);
+                noDataText.LabelFontSize = 14;
+                noDataText.LabelFontColor = ScottPlot.Colors.Gray;
+                noDataText.LabelAlignment = ScottPlot.Alignment.MiddleCenter;
+            }
+
+            CurrentWaitsDurationChart.Plot.Axes.DateTimeTicksBottom();
+            CurrentWaitsDurationChart.Plot.Axes.SetLimitsX(xMin, xMax);
+            CurrentWaitsDurationChart.Plot.YLabel("Total Wait Duration (ms)");
+            _legendPanels[CurrentWaitsDurationChart] = CurrentWaitsDurationChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
+            CurrentWaitsDurationChart.Plot.Legend.FontSize = 12;
+            LockChartVerticalAxis(CurrentWaitsDurationChart);
+            CurrentWaitsDurationChart.Refresh();
+        }
+
+        private void LoadCurrentWaitsBlockedChart(List<BlockedSessionTrendItem> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+        {
+            DateTime rangeEnd = toDate ?? Helpers.ServerTimeHelper.ServerNow;
+            DateTime rangeStart = fromDate ?? rangeEnd.AddHours(-hoursBack);
+            double xMin = rangeStart.ToOADate();
+            double xMax = rangeEnd.ToOADate();
+
+            if (_legendPanels.TryGetValue(CurrentWaitsBlockedChart, out var existingPanel) && existingPanel != null)
+            {
+                CurrentWaitsBlockedChart.Plot.Axes.Remove(existingPanel);
+                _legendPanels[CurrentWaitsBlockedChart] = null;
+            }
+            CurrentWaitsBlockedChart.Plot.Clear();
+            _currentWaitsBlockedHover?.Clear();
+            ApplyDarkModeToChart(CurrentWaitsBlockedChart);
+
+            var databases = data.Select(d => d.DatabaseName).Distinct().OrderBy(d => d).ToList();
+            var colors = TabHelpers.ChartColors;
+
+            int colorIndex = 0;
+            foreach (var db in databases)
+            {
+                var dbData = data.Where(d => d.DatabaseName == db).OrderBy(d => d.CollectionTime).ToList();
+                if (dbData.Count > 0)
+                {
+                    var (xs, ys) = TabHelpers.FillTimeSeriesGaps(
+                        dbData.Select(d => d.CollectionTime),
+                        dbData.Select(d => (double)d.BlockedCount));
+
+                    var scatter = CurrentWaitsBlockedChart.Plot.Add.Scatter(xs, ys);
+                    scatter.LineWidth = 2;
+                    scatter.MarkerSize = 5;
+                    scatter.Color = colors[colorIndex % colors.Length];
+                    scatter.LegendText = db;
+                    _currentWaitsBlockedHover?.Add(scatter, db);
+                    colorIndex++;
+                }
+            }
+
+            if (data.Count == 0)
+            {
+                double xCenter = xMin + (xMax - xMin) / 2;
+                var noDataText = CurrentWaitsBlockedChart.Plot.Add.Text("No data for selected time range", xCenter, 0.5);
+                noDataText.LabelFontSize = 14;
+                noDataText.LabelFontColor = ScottPlot.Colors.Gray;
+                noDataText.LabelAlignment = ScottPlot.Alignment.MiddleCenter;
+            }
+
+            CurrentWaitsBlockedChart.Plot.Axes.DateTimeTicksBottom();
+            CurrentWaitsBlockedChart.Plot.Axes.SetLimitsX(xMin, xMax);
+            CurrentWaitsBlockedChart.Plot.YLabel("Blocked Sessions");
+            _legendPanels[CurrentWaitsBlockedChart] = CurrentWaitsBlockedChart.Plot.ShowLegend(ScottPlot.Edge.Bottom);
+            CurrentWaitsBlockedChart.Plot.Legend.FontSize = 12;
+            LockChartVerticalAxis(CurrentWaitsBlockedChart);
+            CurrentWaitsBlockedChart.Refresh();
+        }
+
         // ====================================================================
         // Context Menu Event Handlers
         // ====================================================================
@@ -1877,7 +1838,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn boundColumn)
                         {
-                            headers.Add(GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("	", headers));
@@ -1920,7 +1881,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(EscapeCsvField(GetColumnHeader(column)));
+                                    headers.Add(EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                                 }
                             }
                             sb.AppendLine(string.Join(",", headers));
@@ -2055,93 +2016,6 @@ private async void CollectionHealth_Refresh_Click(object? sender, RoutedEventArg
             }
         }
 
-        // ====================================================================
-        // Configuration Changes (System Events Tab)
-        // ====================================================================
-
-        #region Configuration Changes
-
-        // Server Configuration Changes
-        private int _serverConfigChangesHoursBack = 24;
-        private DateTime? _serverConfigChangesFromDate;
-        private DateTime? _serverConfigChangesToDate;
-
-        private async void ServerConfigChanges_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                StatusText.Text = "Loading server configuration changes...";
-                var data = await _databaseService.GetServerConfigChangesAsync(_serverConfigChangesHoursBack, _serverConfigChangesFromDate, _serverConfigChangesToDate);
-                ServerConfigChangesDataGrid.ItemsSource = data;
-                UpdateDataGridFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
-                ServerConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                StatusText.Text = $"Loaded {data.Count} server configuration change records";
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading server configuration changes: {ex.Message}");
-                StatusText.Text = "Error loading server configuration changes";
-            }
-        }
-
-        private void ServerConfigChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
-        {
-            ApplyServerConfigChangesPopupFilters();
-        }
-
-        // Database Configuration Changes
-        private int _dbConfigChangesHoursBack = 24;
-        private DateTime? _dbConfigChangesFromDate;
-        private DateTime? _dbConfigChangesToDate;
-
-        private async void DatabaseConfigChanges_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                StatusText.Text = "Loading database configuration changes...";
-                var data = await _databaseService.GetDatabaseConfigChangesAsync(_dbConfigChangesHoursBack, _dbConfigChangesFromDate, _dbConfigChangesToDate);
-                DatabaseConfigChangesDataGrid.ItemsSource = data;
-                UpdateDataGridFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
-                DatabaseConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                StatusText.Text = $"Loaded {data.Count} database configuration change records";
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading database configuration changes: {ex.Message}");
-                StatusText.Text = "Error loading database configuration changes";
-            }
-        }
-
-        // Trace Flag Changes
-        private int _traceFlagChangesHoursBack = 24;
-        private DateTime? _traceFlagChangesFromDate;
-        private DateTime? _traceFlagChangesToDate;
-
-        private async void TraceFlagChanges_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                StatusText.Text = "Loading trace flag changes...";
-                var data = await _databaseService.GetTraceFlagChangesAsync(_traceFlagChangesHoursBack, _traceFlagChangesFromDate, _traceFlagChangesToDate);
-                TraceFlagChangesDataGrid.ItemsSource = data;
-                UpdateDataGridFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
-                TraceFlagChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                StatusText.Text = $"Loaded {data.Count} trace flag change records";
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading trace flag changes: {ex.Message}");
-                StatusText.Text = "Error loading trace flag changes";
-            }
-        }
-
-        private void TraceFlagChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
-        {
-            ApplyTraceFlagChangesPopupFilters();
-        }
-
-        #endregion
-
         // ====================================================================
         // Resource Overview Tab (on Overview tab)
         // ====================================================================
@@ -2497,15 +2371,6 @@ private void ShowFilterPopup(Button button, string columnName, string dataGridNa
             ColumnFilterState? existingFilter = null;
             switch (dataGridName)
             {
-                case "ServerConfigChanges":
-                    _serverConfigChangesFilters.TryGetValue(columnName, out existingFilter);
-                    break;
-                case "DbConfigChanges":
-                    _dbConfigChangesFilters.TryGetValue(columnName, out existingFilter);
-                    break;
-                case "TraceFlagChanges":
-                    _traceFlagChangesFilters.TryGetValue(columnName, out existingFilter);
-                    break;
                 case "CollectionHealth":
                     _collectionHealthFilters.TryGetValue(columnName, out existingFilter);
                     break;
@@ -2529,21 +2394,6 @@ private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
 
             switch (_currentFilterDataGrid)
             {
-                case "ServerConfigChanges":
-                    UpdateFilterState(_serverConfigChangesFilters, e.FilterState);
-                    ApplyServerConfigChangesPopupFilters();
-                    UpdateDataGridFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
-                    break;
-                case "DbConfigChanges":
-                    UpdateFilterState(_dbConfigChangesFilters, e.FilterState);
-                    ApplyDbConfigChangesFilters();
-                    UpdateDataGridFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
-                    break;
-                case "TraceFlagChanges":
-                    UpdateFilterState(_traceFlagChangesFilters, e.FilterState);
-                    ApplyTraceFlagChangesPopupFilters();
-                    UpdateDataGridFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
-                    break;
                 case "CollectionHealth":
                     UpdateFilterState(_collectionHealthFilters, e.FilterState);
                     ApplyCollectionHealthFilters();
@@ -2636,192 +2486,6 @@ private void UpdateDataGridFilterButtonStyles(DataGrid dataGrid, Dictionary<stri
 
         #endregion
 
-        // ====================================================================
-        // Server Config Changes Filter Handlers
-        // ====================================================================
-
-        #region Server Config Changes Filters
-
-        private void ServerConfigChangesFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button button || button.Tag is not string columnName) return;
-            ShowFilterPopup(button, columnName, "ServerConfigChanges");
-        }
-
-        private void ApplyServerConfigChangesPopupFilters()
-        {
-            if (_serverConfigChangesUnfilteredData == null)
-            {
-                _serverConfigChangesUnfilteredData = ServerConfigChangesDataGrid.ItemsSource as List<ServerConfigChangeItem>;
-                if (_serverConfigChangesUnfilteredData == null && ServerConfigChangesDataGrid.ItemsSource != null)
-                {
-                    _serverConfigChangesUnfilteredData = (ServerConfigChangesDataGrid.ItemsSource as IEnumerable<ServerConfigChangeItem>)?.ToList();
-                }
-            }
-
-            if (_serverConfigChangesUnfilteredData == null) return;
-
-            // Get boolean filter states
-            var restartFilter = (ServerConfigChangesRestartFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-            var dynamicFilter = (ServerConfigChangesDynamicFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-            var advancedFilter = (ServerConfigChangesAdvancedFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-
-            if (_serverConfigChangesFilters.Count == 0 && restartFilter == "All" && dynamicFilter == "All" && advancedFilter == "All")
-            {
-                ServerConfigChangesDataGrid.ItemsSource = _serverConfigChangesUnfilteredData;
-                return;
-            }
-
-            var filteredData = _serverConfigChangesUnfilteredData.Where(item =>
-            {
-                // Apply popup filters
-                foreach (var filter in _serverConfigChangesFilters.Values)
-                {
-                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
-                    {
-                        return false;
-                    }
-                }
-
-                // Apply boolean filters
-                if (restartFilter != "All" && restartFilter != null)
-                {
-                    bool expected = restartFilter == "True";
-                    if (item.RequiresRestart != expected) return false;
-                }
-                if (dynamicFilter != "All" && dynamicFilter != null)
-                {
-                    bool expected = dynamicFilter == "True";
-                    if (item.IsDynamic != expected) return false;
-                }
-                if (advancedFilter != "All" && advancedFilter != null)
-                {
-                    bool expected = advancedFilter == "True";
-                    if (item.IsAdvanced != expected) return false;
-                }
-
-                return true;
-            }).ToList();
-
-            ServerConfigChangesDataGrid.ItemsSource = filteredData;
-        }
-
-        #endregion
-
-        // ====================================================================
-        // Database Config Changes Filter Handlers
-        // ====================================================================
-
-        #region Database Config Changes Filters
-
-        private void DbConfigChangesFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button button || button.Tag is not string columnName) return;
-            ShowFilterPopup(button, columnName, "DbConfigChanges");
-        }
-
-        private void ApplyDbConfigChangesFilters()
-        {
-            if (_dbConfigChangesUnfilteredData == null)
-            {
-                _dbConfigChangesUnfilteredData = DatabaseConfigChangesDataGrid.ItemsSource as List<DatabaseConfigChangeItem>;
-                if (_dbConfigChangesUnfilteredData == null && DatabaseConfigChangesDataGrid.ItemsSource != null)
-                {
-                    _dbConfigChangesUnfilteredData = (DatabaseConfigChangesDataGrid.ItemsSource as IEnumerable<DatabaseConfigChangeItem>)?.ToList();
-                }
-            }
-
-            if (_dbConfigChangesUnfilteredData == null) return;
-
-            if (_dbConfigChangesFilters.Count == 0)
-            {
-                DatabaseConfigChangesDataGrid.ItemsSource = _dbConfigChangesUnfilteredData;
-                return;
-            }
-
-            var filteredData = _dbConfigChangesUnfilteredData.Where(item =>
-            {
-                foreach (var filter in _dbConfigChangesFilters.Values)
-                {
-                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
-                    {
-                        return false;
-                    }
-                }
-                return true;
-            }).ToList();
-
-            DatabaseConfigChangesDataGrid.ItemsSource = filteredData;
-        }
-
-        #endregion
-
-        // ====================================================================
-        // Trace Flag Changes Filter Handlers
-        // ====================================================================
-
-        #region Trace Flag Changes Filters
-
-        private void TraceFlagChangesFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button button || button.Tag is not string columnName) return;
-            ShowFilterPopup(button, columnName, "TraceFlagChanges");
-        }
-
-        private void ApplyTraceFlagChangesPopupFilters()
-        {
-            if (_traceFlagChangesUnfilteredData == null)
-            {
-                _traceFlagChangesUnfilteredData = TraceFlagChangesDataGrid.ItemsSource as List<TraceFlagChangeItem>;
-                if (_traceFlagChangesUnfilteredData == null && TraceFlagChangesDataGrid.ItemsSource != null)
-                {
-                    _traceFlagChangesUnfilteredData = (TraceFlagChangesDataGrid.ItemsSource as IEnumerable<TraceFlagChangeItem>)?.ToList();
-                }
-            }
-
-            if (_traceFlagChangesUnfilteredData == null) return;
-
-            // Get boolean filter states
-            var globalFilter = (TraceFlagChangesGlobalFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-            var sessionFilter = (TraceFlagChangesSessionFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-
-            if (_traceFlagChangesFilters.Count == 0 && globalFilter == "All" && sessionFilter == "All")
-            {
-                TraceFlagChangesDataGrid.ItemsSource = _traceFlagChangesUnfilteredData;
-                return;
-            }
-
-            var filteredData = _traceFlagChangesUnfilteredData.Where(item =>
-            {
-                // Apply popup filters
-                foreach (var filter in _traceFlagChangesFilters.Values)
-                {
-                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
-                    {
-                        return false;
-                    }
-                }
-
-                // Apply boolean filters
-                if (globalFilter != "All" && globalFilter != null)
-                {
-                    bool expected = globalFilter == "True";
-                    if (item.IsGlobal != expected) return false;
-                }
-                if (sessionFilter != "All" && sessionFilter != null)
-                {
-                    bool expected = sessionFilter == "True";
-                    if (item.IsSession != expected) return false;
-                }
-
-                return true;
-            }).ToList();
-
-            TraceFlagChangesDataGrid.ItemsSource = filteredData;
-        }
-
-        #endregion
-
         // ====================================================================
         // Collection Health Filter Handlers
         // ====================================================================
diff --git a/Dashboard/Services/ActualPlanExecutor.cs b/Dashboard/Services/ActualPlanExecutor.cs
new file mode 100644
index 00000000..5f21872c
--- /dev/null
+++ b/Dashboard/Services/ActualPlanExecutor.cs
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+
+namespace PerformanceMonitorDashboard.Services;
+
+/// <summary>
+/// Executes a query against SQL Server with SET STATISTICS XML ON to capture
+/// the actual execution plan with runtime statistics. All data result sets
+/// are consumed and discarded — only the plan XML is returned.
+/// </summary>
+public static class ActualPlanExecutor
+{
+    /// <summary>
+    /// Executes the given query text and captures the actual execution plan XML.
+    /// </summary>
+    /// <param name="connectionString">Connection string to the target server.</param>
+    /// <param name="databaseName">Database context for execution.</param>
+    /// <param name="queryText">The query text to execute.</param>
+    /// <param name="planXml">Optional estimated plan XML (used to extract SET options and parameters).</param>
+    /// <param name="isolationLevel">Optional transaction isolation level.</param>
+    /// <param name="isAzureSqlDb">If true, skips USE [database] in the repro script.</param>
+    /// <param name="timeoutSeconds">Command timeout in seconds.</param>
+    /// <param name="cancellationToken">Cancellation token for user abort.</param>
+    /// <returns>The actual execution plan XML, or null if no plan was captured.</returns>
+    public static async Task<string?> ExecuteForActualPlanAsync(
+        string connectionString,
+        string databaseName,
+        string queryText,
+        string? planXml,
+        string? isolationLevel,
+        bool isAzureSqlDb,
+        int timeoutSeconds,
+        CancellationToken cancellationToken)
+    {
+        /* Build the repro script (includes SET options from plan XML via #233) */
+        var reproScript = ReproScriptBuilder.BuildReproScript(
+            queryText, databaseName, planXml, isolationLevel,
+            source: "Actual Plan Capture", isAzureSqlDb: isAzureSqlDb);
+
+        /* Wrap with SET STATISTICS XML ON/OFF */
+        var sb = new StringBuilder();
+        sb.AppendLine("SET STATISTICS XML ON;");
+        sb.AppendLine(reproScript);
+        sb.AppendLine("SET STATISTICS XML OFF;");
+
+        var fullScript = sb.ToString();
+        string? capturedPlanXml = null;
+
+        /* Override database in connection string */
+        var builder = new SqlConnectionStringBuilder(connectionString);
+        if (!string.IsNullOrEmpty(databaseName) && !isAzureSqlDb)
+        {
+            builder.InitialCatalog = databaseName;
+        }
+
+        await using var connection = new SqlConnection(builder.ConnectionString);
+        await connection.OpenAsync(cancellationToken);
+
+        using var command = new SqlCommand(fullScript, connection);
+        command.CommandTimeout = timeoutSeconds;
+
+        /* Wire cancellation token to SqlCommand.Cancel() for clean abort */
+        await using var registration = cancellationToken.Register(() =>
+        {
+            try { command.Cancel(); } catch { /* best effort */ }
+        });
+
+        using var reader = await command.ExecuteReaderAsync(cancellationToken);
+
+        /* Iterate all result sets. SET STATISTICS XML ON causes SQL Server to
+           append a plan XML result set after each statement's data result set.
+           The plan result set has a single row with a single XML column. */
+        do
+        {
+            if (reader.FieldCount == 1 && await reader.ReadAsync(cancellationToken))
+            {
+                var value = reader.GetValue(0)?.ToString();
+                if (value != null && value.TrimStart().StartsWith("<ShowPlanXML", StringComparison.Ordinal))
+                {
+                    /* This is a plan XML result set — capture it */
+                    capturedPlanXml = value;
+                }
+                else
+                {
+                    /* Data result set — consume and discard remaining rows */
+                    while (await reader.ReadAsync(cancellationToken)) { }
+                }
+            }
+            else
+            {
+                /* Multi-column data result set — consume and discard all rows */
+                while (await reader.ReadAsync(cancellationToken)) { }
+            }
+        }
+        while (await reader.NextResultAsync(cancellationToken));
+
+        return capturedPlanXml;
+    }
+}
diff --git a/Dashboard/Services/DatabaseService.Memory.cs b/Dashboard/Services/DatabaseService.Memory.cs
index 28a4d00e..b0ac827f 100644
--- a/Dashboard/Services/DatabaseService.Memory.cs
+++ b/Dashboard/Services/DatabaseService.Memory.cs
@@ -171,6 +171,7 @@ public async Task<List<MemoryGrantStatsItem>> GetMemoryGrantStatsAsync(int hours
         SELECT
             mgs.collection_id,
             mgs.collection_time,
+            mgs.server_start_time,
             mgs.resource_semaphore_id,
             mgs.pool_id,
             mgs.target_memory_mb,
@@ -183,10 +184,9 @@ public async Task<List<MemoryGrantStatsItem>> GetMemoryGrantStatsAsync(int hours
             mgs.waiter_count,
             mgs.timeout_error_count,
             mgs.forced_grant_count,
-            mgs.available_memory_pressure_warning,
-            mgs.waiter_count_warning,
-            mgs.timeout_error_warning,
-            mgs.forced_grant_warning
+            mgs.timeout_error_count_delta,
+            mgs.forced_grant_count_delta,
+            mgs.sample_interval_seconds
         FROM collect.memory_grant_stats AS mgs
         {dateFilter}
         ORDER BY
@@ -212,22 +212,22 @@ ORDER BY
                         {
                             CollectionId = reader.GetInt64(0),
                             CollectionTime = reader.GetDateTime(1),
-                            ResourceSemaphoreId = reader.GetInt16(2),
-                            PoolId = reader.GetInt32(3),
-                            TargetMemoryMb = reader.IsDBNull(4) ? null : reader.GetDecimal(4),
-                            MaxTargetMemoryMb = reader.IsDBNull(5) ? null : reader.GetDecimal(5),
-                            TotalMemoryMb = reader.IsDBNull(6) ? null : reader.GetDecimal(6),
-                            AvailableMemoryMb = reader.IsDBNull(7) ? null : reader.GetDecimal(7),
-                            GrantedMemoryMb = reader.IsDBNull(8) ? null : reader.GetDecimal(8),
-                            UsedMemoryMb = reader.IsDBNull(9) ? null : reader.GetDecimal(9),
-                            GranteeCount = reader.IsDBNull(10) ? null : reader.GetInt32(10),
-                            WaiterCount = reader.IsDBNull(11) ? null : reader.GetInt32(11),
-                            TimeoutErrorCount = reader.IsDBNull(12) ? null : reader.GetInt64(12),
-                            ForcedGrantCount = reader.IsDBNull(13) ? null : reader.GetInt64(13),
-                            AvailableMemoryPressureWarning = reader.IsDBNull(14) ? null : reader.GetBoolean(14),
-                            WaiterCountWarning = reader.IsDBNull(15) ? null : reader.GetBoolean(15),
-                            TimeoutErrorWarning = reader.IsDBNull(16) ? null : reader.GetBoolean(16),
-                            ForcedGrantWarning = reader.IsDBNull(17) ? null : reader.GetBoolean(17)
+                            ServerStartTime = reader.IsDBNull(2) ? DateTime.MinValue : reader.GetDateTime(2),
+                            ResourceSemaphoreId = reader.GetInt16(3),
+                            PoolId = reader.GetInt32(4),
+                            TargetMemoryMb = reader.IsDBNull(5) ? null : reader.GetDecimal(5),
+                            MaxTargetMemoryMb = reader.IsDBNull(6) ? null : reader.GetDecimal(6),
+                            TotalMemoryMb = reader.IsDBNull(7) ? null : reader.GetDecimal(7),
+                            AvailableMemoryMb = reader.IsDBNull(8) ? null : reader.GetDecimal(8),
+                            GrantedMemoryMb = reader.IsDBNull(9) ? null : reader.GetDecimal(9),
+                            UsedMemoryMb = reader.IsDBNull(10) ? null : reader.GetDecimal(10),
+                            GranteeCount = reader.IsDBNull(11) ? null : reader.GetInt32(11),
+                            WaiterCount = reader.IsDBNull(12) ? null : reader.GetInt32(12),
+                            TimeoutErrorCount = reader.IsDBNull(13) ? null : reader.GetInt64(13),
+                            ForcedGrantCount = reader.IsDBNull(14) ? null : reader.GetInt64(14),
+                            TimeoutErrorCountDelta = reader.IsDBNull(15) ? null : reader.GetInt64(15),
+                            ForcedGrantCountDelta = reader.IsDBNull(16) ? null : reader.GetInt64(16),
+                            SampleIntervalSeconds = reader.IsDBNull(17) ? null : reader.GetInt32(17)
                         });
                     }
         
diff --git a/Dashboard/Services/DatabaseService.QueryPerformance.cs b/Dashboard/Services/DatabaseService.QueryPerformance.cs
index 60d2fc02..11e987a9 100644
--- a/Dashboard/Services/DatabaseService.QueryPerformance.cs
+++ b/Dashboard/Services/DatabaseService.QueryPerformance.cs
@@ -699,60 +699,123 @@ public async Task<List<QueryStatsItem>> GetQueryStatsAsync(int hoursBack = 24, D
 
                     bool useCustomDates = fromDate.HasValue && toDate.HasValue;
 
-                    // Use summary view which aggregates by database_name + query_hash
+                    // Aggregate inline from collect.query_stats with time filter applied
+                    // BEFORE the GROUP BY so counts/averages reflect only the selected time range.
+                    // Uses a CTE to first get MAX per plan lifetime (creation_time), then SUM across
+                    // lifetimes. This handles plan eviction correctly — when a plan is evicted and
+                    // re-cached, the cumulative counter resets, so MAX alone undercounts.
                     string query = @"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-        SELECT
-            qs.database_name,
-            qs.query_hash,
-            qs.object_type,
-            qs.object_name,
-            qs.first_execution_time,
-            qs.last_execution_time,
-            qs.execution_count,
-            qs.total_worker_time,
-            qs.avg_worker_time_ms,
-            qs.min_worker_time_ms,
-            qs.max_worker_time_ms,
-            qs.total_elapsed_time,
-            qs.avg_elapsed_time_ms,
-            qs.min_elapsed_time_ms,
-            qs.max_elapsed_time_ms,
-            qs.total_logical_reads,
-            qs.avg_logical_reads,
-            qs.total_logical_writes,
-            qs.avg_logical_writes,
-            qs.total_physical_reads,
-            qs.avg_physical_reads,
-            qs.total_rows,
-            qs.avg_rows,
-            qs.min_rows,
-            qs.max_rows,
-            qs.min_dop,
-            qs.max_dop,
-            qs.min_grant_kb,
-            qs.max_grant_kb,
-            qs.total_spills,
-            qs.min_spills,
-            qs.max_spills,
-            qs.query_text,
-            qs.query_plan_xml,
-            qs.query_plan_hash,
-            qs.sql_handle,
-            qs.plan_handle
-        FROM report.query_stats_summary AS qs
-        WHERE (
-            (@useCustomDates = 0 AND qs.last_execution_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME()))
-            OR
-            (@useCustomDates = 1 AND
-                ((qs.first_execution_time >= @fromDate AND qs.first_execution_time <= @toDate)
-                OR (qs.last_execution_time >= @fromDate AND qs.last_execution_time <= @toDate)
-                OR (qs.first_execution_time <= @fromDate AND qs.last_execution_time >= @toDate)))
+        WITH per_lifetime AS
+        (
+            SELECT
+                database_name = qs.database_name,
+                query_hash = qs.query_hash,
+                object_type = MAX(qs.object_type),
+                schema_name = MAX(qs.schema_name),
+                object_name = MAX(qs.object_name),
+                first_execution_time = MIN(qs.creation_time),
+                last_execution_time = MAX(qs.last_execution_time),
+                execution_count = MAX(qs.execution_count),
+                total_worker_time = MAX(qs.total_worker_time),
+                min_worker_time = MIN(qs.min_worker_time),
+                max_worker_time = MAX(qs.max_worker_time),
+                total_elapsed_time = MAX(qs.total_elapsed_time),
+                min_elapsed_time = MIN(qs.min_elapsed_time),
+                max_elapsed_time = MAX(qs.max_elapsed_time),
+                total_logical_reads = MAX(qs.total_logical_reads),
+                total_logical_writes = MAX(qs.total_logical_writes),
+                total_physical_reads = MAX(qs.total_physical_reads),
+                min_physical_reads = MIN(qs.min_physical_reads),
+                max_physical_reads = MAX(qs.max_physical_reads),
+                total_rows = MAX(qs.total_rows),
+                min_rows = MIN(qs.min_rows),
+                max_rows = MAX(qs.max_rows),
+                min_dop = MIN(qs.min_dop),
+                max_dop = MAX(qs.max_dop),
+                min_grant_kb = MIN(qs.min_grant_kb),
+                max_grant_kb = MAX(qs.max_grant_kb),
+                total_spills = MAX(qs.total_spills),
+                min_spills = MIN(qs.min_spills),
+                max_spills = MAX(qs.max_spills),
+                query_text = MAX(qs.query_text),
+                query_plan_text = MAX(qs.query_plan_text),
+                query_plan_hash = MAX(qs.query_plan_hash),
+                sql_handle = MAX(qs.sql_handle),
+                plan_handle = MAX(qs.plan_handle)
+            FROM collect.query_stats AS qs
+            WHERE (
+                (@useCustomDates = 0 AND qs.last_execution_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME()))
+                OR
+                (@useCustomDates = 1 AND
+                    ((qs.creation_time >= @fromDate AND qs.creation_time <= @toDate)
+                    OR (qs.last_execution_time >= @fromDate AND qs.last_execution_time <= @toDate)
+                    OR (qs.creation_time <= @fromDate AND qs.last_execution_time >= @toDate)))
+            )
+            AND qs.query_text NOT LIKE N'WAITFOR%'
+            GROUP BY
+                qs.database_name,
+                qs.query_hash,
+                qs.creation_time
         )
-        AND qs.query_text NOT LIKE N'WAITFOR%'
+        SELECT
+            database_name = pl.database_name,
+            query_hash = CONVERT(nvarchar(20), pl.query_hash, 1),
+            object_type = MAX(pl.object_type),
+            object_name =
+                CASE MAX(pl.object_type)
+                    WHEN 'STATEMENT'
+                    THEN N'Adhoc'
+                    ELSE QUOTENAME(MAX(pl.schema_name)) + N'.' + QUOTENAME(MAX(pl.object_name))
+                END,
+            first_execution_time = MIN(pl.first_execution_time),
+            last_execution_time = MAX(pl.last_execution_time),
+            execution_count = SUM(pl.execution_count),
+            total_worker_time = SUM(pl.total_worker_time),
+            avg_worker_time_ms = SUM(pl.total_worker_time) / 1000.0 / NULLIF(SUM(pl.execution_count), 0),
+            min_worker_time_ms = MIN(pl.min_worker_time) / 1000.0,
+            max_worker_time_ms = MAX(pl.max_worker_time) / 1000.0,
+            total_elapsed_time = SUM(pl.total_elapsed_time),
+            avg_elapsed_time_ms = SUM(pl.total_elapsed_time) / 1000.0 / NULLIF(SUM(pl.execution_count), 0),
+            min_elapsed_time_ms = MIN(pl.min_elapsed_time) / 1000.0,
+            max_elapsed_time_ms = MAX(pl.max_elapsed_time) / 1000.0,
+            total_logical_reads = SUM(pl.total_logical_reads),
+            avg_logical_reads = SUM(pl.total_logical_reads) / NULLIF(SUM(pl.execution_count), 0),
+            total_logical_writes = SUM(pl.total_logical_writes),
+            avg_logical_writes = SUM(pl.total_logical_writes) / NULLIF(SUM(pl.execution_count), 0),
+            total_physical_reads = SUM(pl.total_physical_reads),
+            avg_physical_reads = SUM(pl.total_physical_reads) / NULLIF(SUM(pl.execution_count), 0),
+            min_physical_reads = MIN(pl.min_physical_reads),
+            max_physical_reads = MAX(pl.max_physical_reads),
+            total_rows = SUM(pl.total_rows),
+            avg_rows = SUM(pl.total_rows) / NULLIF(SUM(pl.execution_count), 0),
+            min_rows = MIN(pl.min_rows),
+            max_rows = MAX(pl.max_rows),
+            min_dop = MIN(pl.min_dop),
+            max_dop = MAX(pl.max_dop),
+            min_grant_kb = MIN(pl.min_grant_kb),
+            max_grant_kb = MAX(pl.max_grant_kb),
+            total_spills = SUM(pl.total_spills),
+            min_spills = MIN(pl.min_spills),
+            max_spills = MAX(pl.max_spills),
+            query_text = CONVERT(nvarchar(max), MAX(pl.query_text)),
+            query_plan_xml = MAX(pl.query_plan_text),
+            query_plan_hash = CONVERT(nvarchar(20), MAX(pl.query_plan_hash), 1),
+            sql_handle = CONVERT(nvarchar(130), MAX(pl.sql_handle), 1),
+            plan_handle = CONVERT(nvarchar(130), MAX(pl.plan_handle), 1)
+        FROM per_lifetime AS pl
+        GROUP BY
+            pl.database_name,
+            pl.query_hash
         ORDER BY
-            qs.avg_worker_time_ms DESC;";
+            avg_worker_time_ms DESC
+        OPTION
+        (
+            HASH GROUP,
+            HASH JOIN,
+            USE HINT('ENABLE_PARALLEL_PLAN_PREFERENCE')
+        );";
 
                     using var command = new SqlCommand(query, connection);
                     command.CommandTimeout = 120;
@@ -788,22 +851,24 @@ ORDER BY
                             AvgLogicalWrites = reader.IsDBNull(18) ? null : reader.GetInt64(18),
                             TotalPhysicalReads = reader.IsDBNull(19) ? 0 : reader.GetInt64(19),
                             AvgPhysicalReads = reader.IsDBNull(20) ? null : reader.GetInt64(20),
-                            TotalRows = reader.IsDBNull(21) ? 0 : reader.GetInt64(21),
-                            AvgRows = reader.IsDBNull(22) ? null : reader.GetInt64(22),
-                            MinRows = reader.IsDBNull(23) ? null : reader.GetInt64(23),
-                            MaxRows = reader.IsDBNull(24) ? null : reader.GetInt64(24),
-                            MinDop = reader.IsDBNull(25) ? null : reader.GetInt16(25),
-                            MaxDop = reader.IsDBNull(26) ? null : reader.GetInt16(26),
-                            MinGrantKb = reader.IsDBNull(27) ? null : reader.GetInt64(27),
-                            MaxGrantKb = reader.IsDBNull(28) ? null : reader.GetInt64(28),
-                            TotalSpills = reader.IsDBNull(29) ? 0 : reader.GetInt64(29),
-                            MinSpills = reader.IsDBNull(30) ? null : reader.GetInt64(30),
-                            MaxSpills = reader.IsDBNull(31) ? null : reader.GetInt64(31),
-                            QueryText = reader.IsDBNull(32) ? null : reader.GetString(32),
-                            QueryPlanXml = reader.IsDBNull(33) ? null : reader.GetString(33),
-                            QueryPlanHash = reader.IsDBNull(34) ? null : reader.GetString(34),
-                            SqlHandle = reader.IsDBNull(35) ? null : reader.GetString(35),
-                            PlanHandle = reader.IsDBNull(36) ? null : reader.GetString(36)
+                            MinPhysicalReads = reader.IsDBNull(21) ? null : reader.GetInt64(21),
+                            MaxPhysicalReads = reader.IsDBNull(22) ? null : reader.GetInt64(22),
+                            TotalRows = reader.IsDBNull(23) ? 0 : reader.GetInt64(23),
+                            AvgRows = reader.IsDBNull(24) ? null : reader.GetInt64(24),
+                            MinRows = reader.IsDBNull(25) ? null : reader.GetInt64(25),
+                            MaxRows = reader.IsDBNull(26) ? null : reader.GetInt64(26),
+                            MinDop = reader.IsDBNull(27) ? null : reader.GetInt16(27),
+                            MaxDop = reader.IsDBNull(28) ? null : reader.GetInt16(28),
+                            MinGrantKb = reader.IsDBNull(29) ? null : reader.GetInt64(29),
+                            MaxGrantKb = reader.IsDBNull(30) ? null : reader.GetInt64(30),
+                            TotalSpills = reader.IsDBNull(31) ? 0 : reader.GetInt64(31),
+                            MinSpills = reader.IsDBNull(32) ? null : reader.GetInt64(32),
+                            MaxSpills = reader.IsDBNull(33) ? null : reader.GetInt64(33),
+                            QueryText = reader.IsDBNull(34) ? null : reader.GetString(34),
+                            QueryPlanXml = reader.IsDBNull(35) ? null : reader.GetString(35),
+                            QueryPlanHash = reader.IsDBNull(36) ? null : reader.GetString(36),
+                            SqlHandle = reader.IsDBNull(37) ? null : reader.GetString(37),
+                            PlanHandle = reader.IsDBNull(38) ? null : reader.GetString(38)
                         });
                     }
 
@@ -819,59 +884,113 @@ public async Task<List<ProcedureStatsItem>> GetProcedureStatsAsync(int hoursBack
 
                     bool useCustomDates = fromDate.HasValue && toDate.HasValue;
 
-                    // Use summary view which aggregates by database_name + schema_name + object_name
+                    // Aggregate inline from collect.procedure_stats with time filter applied
+                    // BEFORE the GROUP BY so counts/averages reflect only the selected time range.
+                    // Uses a CTE to first get MAX per plan lifetime (cached_time), then SUM across
+                    // lifetimes. This handles plan eviction correctly — when a plan is evicted and
+                    // re-cached, the cumulative counter resets, so MAX alone undercounts.
                     string query = @"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-        SELECT
-            ps.database_name,
-            ps.object_id,
-            ps.object_name,
-            ps.schema_name,
-            ps.procedure_name,
-            ps.object_type,
-            ps.type_desc,
-            ps.first_cached_time,
-            ps.last_execution_time,
-            ps.execution_count,
-            ps.total_worker_time,
-            ps.avg_worker_time_ms,
-            ps.min_worker_time_ms,
-            ps.max_worker_time_ms,
-            ps.total_elapsed_time,
-            ps.avg_elapsed_time_ms,
-            ps.min_elapsed_time_ms,
-            ps.max_elapsed_time_ms,
-            ps.total_logical_reads,
-            ps.avg_logical_reads,
-            ps.min_logical_reads,
-            ps.max_logical_reads,
-            ps.total_logical_writes,
-            ps.avg_logical_writes,
-            ps.min_logical_writes,
-            ps.max_logical_writes,
-            ps.total_physical_reads,
-            ps.avg_physical_reads,
-            ps.min_physical_reads,
-            ps.max_physical_reads,
-            ps.total_spills,
-            ps.avg_spills,
-            ps.min_spills,
-            ps.max_spills,
-            ps.query_plan_xml,
-            ps.sql_handle,
-            ps.plan_handle
-        FROM report.procedure_stats_summary AS ps
-        WHERE (
-            (@useCustomDates = 0 AND ps.last_execution_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME()))
-            OR
-            (@useCustomDates = 1 AND
-                ((ps.first_cached_time >= @fromDate AND ps.first_cached_time <= @toDate)
-                OR (ps.last_execution_time >= @fromDate AND ps.last_execution_time <= @toDate)
-                OR (ps.first_cached_time <= @fromDate AND ps.last_execution_time >= @toDate)))
+        WITH per_lifetime AS
+        (
+            SELECT
+                database_name = ps.database_name,
+                schema_name = ps.schema_name,
+                object_name = ps.object_name,
+                object_id = MAX(ps.object_id),
+                object_type = MAX(ps.object_type),
+                type_desc = MAX(ps.type_desc),
+                first_cached_time = MIN(ps.cached_time),
+                last_execution_time = MAX(ps.last_execution_time),
+                execution_count = MAX(ps.execution_count),
+                total_worker_time = MAX(ps.total_worker_time),
+                min_worker_time = MIN(ps.min_worker_time),
+                max_worker_time = MAX(ps.max_worker_time),
+                total_elapsed_time = MAX(ps.total_elapsed_time),
+                min_elapsed_time = MIN(ps.min_elapsed_time),
+                max_elapsed_time = MAX(ps.max_elapsed_time),
+                total_logical_reads = MAX(ps.total_logical_reads),
+                min_logical_reads = MIN(ps.min_logical_reads),
+                max_logical_reads = MAX(ps.max_logical_reads),
+                total_logical_writes = MAX(ps.total_logical_writes),
+                min_logical_writes = MIN(ps.min_logical_writes),
+                max_logical_writes = MAX(ps.max_logical_writes),
+                total_physical_reads = MAX(ps.total_physical_reads),
+                min_physical_reads = MIN(ps.min_physical_reads),
+                max_physical_reads = MAX(ps.max_physical_reads),
+                total_spills = MAX(ps.total_spills),
+                min_spills = MIN(ps.min_spills),
+                max_spills = MAX(ps.max_spills),
+                query_plan_text = MAX(ps.query_plan_text),
+                sql_handle = MAX(ps.sql_handle),
+                plan_handle = MAX(ps.plan_handle)
+            FROM collect.procedure_stats AS ps
+            WHERE (
+                (@useCustomDates = 0 AND ps.last_execution_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME()))
+                OR
+                (@useCustomDates = 1 AND
+                    ((ps.cached_time >= @fromDate AND ps.cached_time <= @toDate)
+                    OR (ps.last_execution_time >= @fromDate AND ps.last_execution_time <= @toDate)
+                    OR (ps.cached_time <= @fromDate AND ps.last_execution_time >= @toDate)))
+            )
+            GROUP BY
+                ps.database_name,
+                ps.schema_name,
+                ps.object_name,
+                ps.cached_time
         )
+        SELECT
+            database_name = pl.database_name,
+            object_id = MAX(pl.object_id),
+            object_name = QUOTENAME(pl.schema_name) + N'.' + QUOTENAME(pl.object_name),
+            schema_name = pl.schema_name,
+            procedure_name = pl.object_name,
+            object_type = MAX(pl.object_type),
+            type_desc = MAX(pl.type_desc),
+            first_cached_time = MIN(pl.first_cached_time),
+            last_execution_time = MAX(pl.last_execution_time),
+            execution_count = SUM(pl.execution_count),
+            total_worker_time = SUM(pl.total_worker_time),
+            avg_worker_time_ms = SUM(pl.total_worker_time) / 1000.0 / NULLIF(SUM(pl.execution_count), 0),
+            min_worker_time_ms = MIN(pl.min_worker_time) / 1000.0,
+            max_worker_time_ms = MAX(pl.max_worker_time) / 1000.0,
+            total_elapsed_time = SUM(pl.total_elapsed_time),
+            avg_elapsed_time_ms = SUM(pl.total_elapsed_time) / 1000.0 / NULLIF(SUM(pl.execution_count), 0),
+            min_elapsed_time_ms = MIN(pl.min_elapsed_time) / 1000.0,
+            max_elapsed_time_ms = MAX(pl.max_elapsed_time) / 1000.0,
+            total_logical_reads = SUM(pl.total_logical_reads),
+            avg_logical_reads = SUM(pl.total_logical_reads) / NULLIF(SUM(pl.execution_count), 0),
+            min_logical_reads = MIN(pl.min_logical_reads),
+            max_logical_reads = MAX(pl.max_logical_reads),
+            total_logical_writes = SUM(pl.total_logical_writes),
+            avg_logical_writes = SUM(pl.total_logical_writes) / NULLIF(SUM(pl.execution_count), 0),
+            min_logical_writes = MIN(pl.min_logical_writes),
+            max_logical_writes = MAX(pl.max_logical_writes),
+            total_physical_reads = SUM(pl.total_physical_reads),
+            avg_physical_reads = SUM(pl.total_physical_reads) / NULLIF(SUM(pl.execution_count), 0),
+            min_physical_reads = MIN(pl.min_physical_reads),
+            max_physical_reads = MAX(pl.max_physical_reads),
+            total_spills = SUM(pl.total_spills),
+            avg_spills = SUM(pl.total_spills) / NULLIF(SUM(pl.execution_count), 0),
+            min_spills = MIN(pl.min_spills),
+            max_spills = MAX(pl.max_spills),
+            query_plan_xml = MAX(pl.query_plan_text),
+            sql_handle = CONVERT(nvarchar(130), MAX(pl.sql_handle), 1),
+            plan_handle = CONVERT(nvarchar(130), MAX(pl.plan_handle), 1)
+        FROM per_lifetime AS pl
+        GROUP BY
+            pl.database_name,
+            pl.schema_name,
+            pl.object_name
         ORDER BY
-            ps.avg_worker_time_ms DESC;";
+            avg_worker_time_ms DESC
+        OPTION
+        (
+            HASH GROUP,
+            HASH JOIN,
+            USE HINT('ENABLE_PARALLEL_PLAN_PREFERENCE')
+        );";
 
                     using var command = new SqlCommand(query, connection);
                     command.CommandTimeout = 120;
@@ -938,63 +1057,76 @@ public async Task<List<QueryStoreItem>> GetQueryStoreDataAsync(int hoursBack = 2
 
                     bool useCustomDates = fromDate.HasValue && toDate.HasValue;
 
-                    // Use summary view which aggregates by database_name + query_id (no plan_id)
+                    // Aggregate inline from collect.query_store_data with time filter applied
+                    // BEFORE the GROUP BY so counts/averages reflect only the selected time range.
                     // Note: query_plan_xml is NOT fetched here for performance - use GetQueryStorePlanXmlAsync on demand
                     string query = @"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
         SELECT
-            qss.database_name,
-            qss.query_id,
-            qss.execution_type_desc,
-            qss.module_name,
-            qss.first_execution_time,
-            qss.last_execution_time,
-            qss.execution_count,
-            qss.plan_count,
-            qss.avg_duration_ms,
-            qss.min_duration_ms,
-            qss.max_duration_ms,
-            qss.avg_cpu_time_ms,
-            qss.min_cpu_time_ms,
-            qss.max_cpu_time_ms,
-            qss.avg_logical_reads,
-            qss.min_logical_reads,
-            qss.max_logical_reads,
-            qss.avg_logical_writes,
-            qss.min_logical_writes,
-            qss.max_logical_writes,
-            qss.avg_physical_reads,
-            qss.min_physical_reads,
-            qss.max_physical_reads,
-            qss.min_dop,
-            qss.max_dop,
-            qss.avg_memory_pages,
-            qss.min_memory_pages,
-            qss.max_memory_pages,
-            qss.avg_rowcount,
-            qss.min_rowcount,
-            qss.max_rowcount,
-            qss.avg_tempdb_pages,
-            qss.min_tempdb_pages,
-            qss.max_tempdb_pages,
-            qss.plan_type,
-            qss.is_forced_plan,
-            qss.compatibility_level,
-            qss.query_sql_text,
-            qss.query_plan_hash
-        FROM report.query_store_summary AS qss
+            database_name = qsd.database_name,
+            query_id = qsd.query_id,
+            execution_type_desc = MAX(qsd.execution_type_desc),
+            module_name = MAX(qsd.module_name),
+            first_execution_time = MIN(qsd.server_first_execution_time),
+            last_execution_time = MAX(qsd.server_last_execution_time),
+            execution_count = SUM(qsd.count_executions),
+            plan_count = COUNT_BIG(DISTINCT qsd.plan_id),
+            avg_duration_ms = SUM(qsd.avg_duration * qsd.count_executions) / 1000.0 / NULLIF(SUM(qsd.count_executions), 0),
+            min_duration_ms = MIN(qsd.min_duration) / 1000.0,
+            max_duration_ms = MAX(qsd.max_duration) / 1000.0,
+            avg_cpu_time_ms = SUM(qsd.avg_cpu_time * qsd.count_executions) / 1000.0 / NULLIF(SUM(qsd.count_executions), 0),
+            min_cpu_time_ms = MIN(qsd.min_cpu_time) / 1000.0,
+            max_cpu_time_ms = MAX(qsd.max_cpu_time) / 1000.0,
+            avg_logical_reads = SUM(qsd.avg_logical_io_reads * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_logical_reads = MIN(qsd.min_logical_io_reads),
+            max_logical_reads = MAX(qsd.max_logical_io_reads),
+            avg_logical_writes = SUM(qsd.avg_logical_io_writes * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_logical_writes = MIN(qsd.min_logical_io_writes),
+            max_logical_writes = MAX(qsd.max_logical_io_writes),
+            avg_physical_reads = SUM(qsd.avg_physical_io_reads * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_physical_reads = MIN(qsd.min_physical_io_reads),
+            max_physical_reads = MAX(qsd.max_physical_io_reads),
+            min_dop = MIN(qsd.min_dop),
+            max_dop = MAX(qsd.max_dop),
+            avg_memory_pages = SUM(qsd.avg_query_max_used_memory * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_memory_pages = MIN(qsd.min_query_max_used_memory),
+            max_memory_pages = MAX(qsd.max_query_max_used_memory),
+            avg_rowcount = SUM(qsd.avg_rowcount * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_rowcount = MIN(qsd.min_rowcount),
+            max_rowcount = MAX(qsd.max_rowcount),
+            avg_tempdb_pages = SUM(ISNULL(qsd.avg_tempdb_space_used, 0) * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_tempdb_pages = MIN(qsd.min_tempdb_space_used),
+            max_tempdb_pages = MAX(qsd.max_tempdb_space_used),
+            plan_type = MAX(qsd.plan_type),
+            is_forced_plan = MAX(CONVERT(tinyint, qsd.is_forced_plan)),
+            compatibility_level = MAX(qsd.compatibility_level),
+            query_sql_text = CONVERT(nvarchar(max), MAX(qsd.query_sql_text)),
+            query_plan_hash = CONVERT(nvarchar(20), MAX(qsd.query_plan_hash), 1),
+            force_failure_count = SUM(qsd.force_failure_count),
+            last_force_failure_reason_desc = MAX(qsd.last_force_failure_reason_desc),
+            plan_forcing_type = MAX(qsd.plan_forcing_type),
+            min_clr_time_ms = MIN(qsd.min_clr_time) / 1000.0,
+            max_clr_time_ms = MAX(qsd.max_clr_time) / 1000.0,
+            min_num_physical_io_reads = MIN(qsd.min_num_physical_io_reads),
+            max_num_physical_io_reads = MAX(qsd.max_num_physical_io_reads),
+            min_log_bytes_used = MIN(qsd.min_log_bytes_used),
+            max_log_bytes_used = MAX(qsd.max_log_bytes_used)
+        FROM collect.query_store_data AS qsd
         WHERE (
-            (@useCustomDates = 0 AND qss.last_execution_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME()))
+            (@useCustomDates = 0 AND qsd.server_last_execution_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME()))
             OR
             (@useCustomDates = 1 AND
-                ((qss.first_execution_time >= @fromDate AND qss.first_execution_time <= @toDate)
-                OR (qss.last_execution_time >= @fromDate AND qss.last_execution_time <= @toDate)
-                OR (qss.first_execution_time <= @fromDate AND qss.last_execution_time >= @toDate)))
+                ((qsd.server_first_execution_time >= @fromDate AND qsd.server_first_execution_time <= @toDate)
+                OR (qsd.server_last_execution_time >= @fromDate AND qsd.server_last_execution_time <= @toDate)
+                OR (qsd.server_first_execution_time <= @fromDate AND qsd.server_last_execution_time >= @toDate)))
         )
-        AND qss.query_sql_text NOT LIKE N'WAITFOR%'
+        AND qsd.query_sql_text NOT LIKE N'WAITFOR%'
+        GROUP BY
+            qsd.database_name,
+            qsd.query_id
         ORDER BY
-            qss.avg_cpu_time_ms DESC
+            avg_cpu_time_ms DESC
         OPTION
         (
             HASH GROUP,
@@ -1053,7 +1185,16 @@ USE HINT('ENABLE_PARALLEL_PLAN_PREFERENCE')
                             IsForcedPlan = !reader.IsDBNull(35) && reader.GetByte(35) == 1,
                             CompatibilityLevel = reader.IsDBNull(36) ? null : reader.GetInt16(36),
                             QuerySqlText = reader.IsDBNull(37) ? null : reader.GetString(37),
-                            QueryPlanHash = reader.IsDBNull(38) ? null : reader.GetString(38)
+                            QueryPlanHash = reader.IsDBNull(38) ? null : reader.GetString(38),
+                            ForceFailureCount = reader.IsDBNull(39) ? null : reader.GetInt64(39),
+                            LastForceFailureReasonDesc = reader.IsDBNull(40) ? null : reader.GetString(40),
+                            PlanForcingType = reader.IsDBNull(41) ? null : reader.GetString(41),
+                            MinClrTimeMs = reader.IsDBNull(42) ? null : Convert.ToDouble(reader.GetValue(42), CultureInfo.InvariantCulture),
+                            MaxClrTimeMs = reader.IsDBNull(43) ? null : Convert.ToDouble(reader.GetValue(43), CultureInfo.InvariantCulture),
+                            MinNumPhysicalIoReads = reader.IsDBNull(44) ? null : reader.GetInt64(44),
+                            MaxNumPhysicalIoReads = reader.IsDBNull(45) ? null : reader.GetInt64(45),
+                            MinLogBytesUsed = reader.IsDBNull(46) ? null : reader.GetInt64(46),
+                            MaxLogBytesUsed = reader.IsDBNull(47) ? null : reader.GetInt64(47)
                             // QueryPlanXml is fetched on-demand via GetQueryStorePlanXmlAsync
                         });
                     }
@@ -1165,9 +1306,12 @@ public async Task<List<QueryStoreRegressionItem>> GetQueryStoreRegressionsAsync(
                     var connection = tc.Connection;
 
                     /*
-                    report.query_store_regressions is now an inline TVF requiring parameters:
-                    - @start_date: divides baseline from recent (baseline = data BEFORE this date)
-                    - @end_date: end of recent period (recent = data between start_date and end_date)
+                    report.query_store_regressions inline TVF:
+                    - Bounded baseline (mirror window before @start_date, same duration as recent)
+                    - Weighted averages (execution-count weighted)
+                    - Multi-metric detection (duration, CPU, or reads >25%)
+                    - Absolute minimums (baseline >= 1ms duration or >= 100 reads)
+                    - Ranked by additional_duration_ms (total extra time = delta * exec count)
                     */
                     string query = @"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
@@ -1184,17 +1328,22 @@ public async Task<List<QueryStoreRegressionItem>> GetQueryStoreRegressionsAsync(
             qsr.baseline_reads,
             qsr.recent_reads,
             qsr.io_regression_percent,
+            qsr.additional_duration_ms,
+            qsr.baseline_exec_count,
+            qsr.recent_exec_count,
+            qsr.baseline_plan_count,
+            qsr.recent_plan_count,
             qsr.severity,
             qsr.query_text_sample,
             qsr.last_execution_time
         FROM report.query_store_regressions(@start_date, @end_date) AS qsr
         ORDER BY
-            qsr.duration_regression_percent DESC;";
+            qsr.additional_duration_ms DESC;";
 
                     using var command = new SqlCommand(query, connection);
                     command.CommandTimeout = 120;
 
-                    /*Calculate the time window - baseline is everything before start_date, recent is start_date to end_date*/
+                    /*Calculate the time window - baseline is mirror window before start_date, recent is start_date to end_date*/
                     DateTime startDate;
                     DateTime endDate;
 
@@ -1218,7 +1367,6 @@ ORDER BY
                     using var reader = await command.ExecuteReaderAsync();
                     while (await reader.ReadAsync())
                     {
-                        /*Use Convert.ToDecimal for robustness - TVF may return bigint or decimal depending on query store aggregations*/
                         items.Add(new QueryStoreRegressionItem
                         {
                             DatabaseName = reader.GetString(0),
@@ -1232,9 +1380,14 @@ ORDER BY
                             BaselineReads = reader.IsDBNull(8) ? 0 : Convert.ToDecimal(reader.GetValue(8), CultureInfo.InvariantCulture),
                             RecentReads = reader.IsDBNull(9) ? 0 : Convert.ToDecimal(reader.GetValue(9), CultureInfo.InvariantCulture),
                             IoRegressionPercent = reader.IsDBNull(10) ? 0 : Convert.ToDecimal(reader.GetValue(10), CultureInfo.InvariantCulture),
-                            Severity = reader.IsDBNull(11) ? string.Empty : reader.GetString(11),
-                            QueryTextSample = reader.IsDBNull(12) ? string.Empty : reader.GetString(12),
-                            LastExecutionTime = reader.IsDBNull(13) ? null : reader.GetDateTime(13)
+                            AdditionalDurationMs = reader.IsDBNull(11) ? 0 : Convert.ToDecimal(reader.GetValue(11), CultureInfo.InvariantCulture),
+                            BaselineExecCount = reader.IsDBNull(12) ? 0 : Convert.ToInt64(reader.GetValue(12)),
+                            RecentExecCount = reader.IsDBNull(13) ? 0 : Convert.ToInt64(reader.GetValue(13)),
+                            BaselinePlanCount = reader.IsDBNull(14) ? 0 : Convert.ToInt32(reader.GetValue(14)),
+                            RecentPlanCount = reader.IsDBNull(15) ? 0 : Convert.ToInt32(reader.GetValue(15)),
+                            Severity = reader.IsDBNull(16) ? string.Empty : reader.GetString(16),
+                            QueryTextSample = reader.IsDBNull(17) ? string.Empty : reader.GetString(17),
+                            LastExecutionTime = reader.IsDBNull(18) ? null : reader.GetDateTime(18)
                         });
                     }
         
@@ -1338,6 +1491,119 @@ ORDER BY
                     return items;
                 }
 
+                public async Task<List<TracePatternDetailItem>> GetTracePatternHistoryAsync(string databaseName, string queryPattern, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+                {
+                    var items = new List<TracePatternDetailItem>();
+
+                    await using var tc = await OpenThrottledConnectionAsync();
+                    var connection = tc.Connection;
+
+                    string timeFilter = fromDate.HasValue && toDate.HasValue
+                        ? "ta.end_time >= @from_date AND ta.end_time <= @to_date"
+                        : "ta.end_time >= DATEADD(HOUR, @hours_back, SYSDATETIME())";
+
+                    /* Trace events can appear in multiple collection cycles because the trace file
+                       retains events until it rolls over. Deduplicate by partitioning on the event's
+                       natural key (end_time + duration + cpu + reads) and keeping only the first row. */
+                    string query = $@"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        WITH
+            numbered AS
+        (
+            SELECT
+                ta.analysis_id,
+                ta.collection_time,
+                ta.event_name,
+                ta.database_name,
+                ta.login_name,
+                ta.application_name,
+                ta.host_name,
+                ta.spid,
+                ta.duration_ms,
+                ta.cpu_ms,
+                ta.reads,
+                ta.writes,
+                ta.row_counts,
+                ta.start_time,
+                ta.end_time,
+                sql_text = LEFT(ta.sql_text, 4000),
+                ta.object_id,
+                rn = ROW_NUMBER() OVER
+                (
+                    PARTITION BY
+                        ta.end_time,
+                        ta.duration_ms,
+                        ta.cpu_ms,
+                        ta.reads,
+                        ta.spid
+                    ORDER BY
+                        ta.collection_time
+                )
+            FROM collect.trace_analysis AS ta
+            WHERE ta.database_name = @database_name
+            AND   LEFT(ta.sql_text, 200) = @query_pattern
+            AND   {timeFilter}
+        )
+        SELECT
+            analysis_id,
+            collection_time,
+            event_name,
+            database_name,
+            login_name,
+            application_name,
+            host_name,
+            spid,
+            duration_ms,
+            cpu_ms,
+            reads,
+            writes,
+            row_counts,
+            start_time,
+            end_time,
+            sql_text,
+            object_id
+        FROM numbered
+        WHERE rn = 1
+        ORDER BY
+            end_time DESC;";
+
+                    using var command = new SqlCommand(query, connection);
+                    command.CommandTimeout = 120;
+                    command.Parameters.Add(new SqlParameter("@database_name", SqlDbType.NVarChar, 128) { Value = databaseName });
+                    command.Parameters.Add(new SqlParameter("@query_pattern", SqlDbType.NVarChar, 200) { Value = queryPattern });
+                    command.Parameters.Add(new SqlParameter("@hours_back", SqlDbType.Int) { Value = -hoursBack });
+                    if (fromDate.HasValue) command.Parameters.Add(new SqlParameter("@from_date", SqlDbType.DateTime2) { Value = fromDate.Value });
+                    if (toDate.HasValue) command.Parameters.Add(new SqlParameter("@to_date", SqlDbType.DateTime2) { Value = toDate.Value });
+
+                    using var reader = await command.ExecuteReaderAsync();
+                    while (await reader.ReadAsync())
+                    {
+                        items.Add(new TracePatternDetailItem
+                        {
+                            AnalysisId = reader.GetInt64(0),
+                            CollectionTime = reader.GetDateTime(1),
+                            EventName = reader.IsDBNull(2) ? string.Empty : reader.GetString(2),
+                            DatabaseName = reader.IsDBNull(3) ? null : reader.GetString(3),
+                            LoginName = reader.IsDBNull(4) ? null : reader.GetString(4),
+                            ApplicationName = reader.IsDBNull(5) ? null : reader.GetString(5),
+                            HostName = reader.IsDBNull(6) ? null : reader.GetString(6),
+                            Spid = reader.IsDBNull(7) ? null : reader.GetInt32(7),
+                            DurationMs = reader.IsDBNull(8) ? null : reader.GetInt64(8),
+                            CpuMs = reader.IsDBNull(9) ? null : reader.GetInt64(9),
+                            Reads = reader.IsDBNull(10) ? null : reader.GetInt64(10),
+                            Writes = reader.IsDBNull(11) ? null : reader.GetInt64(11),
+                            RowCounts = reader.IsDBNull(12) ? null : reader.GetInt64(12),
+                            StartTime = reader.IsDBNull(13) ? null : reader.GetDateTime(13),
+                            EndTime = reader.IsDBNull(14) ? null : reader.GetDateTime(14),
+                            SqlText = reader.IsDBNull(15) ? null : reader.GetString(15),
+                            ObjectId = reader.IsDBNull(16) ? null : reader.GetInt64(16)
+                        });
+                    }
+
+                    return items;
+                }
+
                 public async Task<List<BlockingDeadlockStatsItem>> GetBlockingDeadlockStatsAsync(int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
                 {
                     var items = new List<BlockingDeadlockStatsItem>();
@@ -1443,8 +1709,8 @@ public async Task<List<QueryExecutionHistoryItem>> GetQueryStoreHistoryAsync(str
                     var connection = tc.Connection;
 
                     var timeFilter = fromDate.HasValue && toDate.HasValue
-                        ? "AND   qsd.collection_time >= @from_date AND qsd.collection_time <= @to_date"
-                        : "AND   qsd.collection_time >= DATEADD(HOUR, -@hours_back, SYSDATETIME())";
+                        ? "AND   qsd.server_last_execution_time >= @from_date AND qsd.server_last_execution_time <= @to_date"
+                        : "AND   qsd.server_last_execution_time >= DATEADD(HOUR, -@hours_back, SYSDATETIME())";
 
                     string query = $@"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
@@ -1480,6 +1746,8 @@ public async Task<List<QueryExecutionHistoryItem>> GetQueryStoreHistoryAsync(str
             avg_tempdb_space_used = SUM(qsd.avg_tempdb_space_used * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
             min_tempdb_space_used = MIN(qsd.min_tempdb_space_used),
             max_tempdb_space_used = MAX(qsd.max_tempdb_space_used),
+            query_hash = CONVERT(varchar(20), MAX(qsd.query_hash), 1),
+            query_plan_hash = CONVERT(varchar(20), MAX(qsd.query_plan_hash), 1),
             plan_type = MAX(qsd.plan_type),
             is_forced_plan = CAST(MAX(CAST(qsd.is_forced_plan AS tinyint)) AS bit),
             force_failure_count = MAX(qsd.force_failure_count),
@@ -1547,12 +1815,14 @@ ORDER BY
                             AvgTempdbSpaceUsed = reader.IsDBNull(27) ? null : reader.GetInt64(27),
                             MinTempdbSpaceUsed = reader.IsDBNull(28) ? null : reader.GetInt64(28),
                             MaxTempdbSpaceUsed = reader.IsDBNull(29) ? null : reader.GetInt64(29),
-                            PlanType = reader.IsDBNull(30) ? null : reader.GetString(30),
-                            IsForcedPlan = reader.GetBoolean(31),
-                            ForceFailureCount = reader.IsDBNull(32) ? null : reader.GetInt64(32),
-                            LastForceFailureReasonDesc = reader.IsDBNull(33) ? null : reader.GetString(33),
-                            PlanForcingType = reader.IsDBNull(34) ? null : reader.GetString(34),
-                            CompatibilityLevel = reader.IsDBNull(35) ? null : reader.GetInt16(35)
+                            QueryHash = reader.IsDBNull(30) ? null : reader.GetString(30),
+                            QueryPlanHash = reader.IsDBNull(31) ? null : reader.GetString(31),
+                            PlanType = reader.IsDBNull(32) ? null : reader.GetString(32),
+                            IsForcedPlan = reader.GetBoolean(33),
+                            ForceFailureCount = reader.IsDBNull(34) ? null : reader.GetInt64(34),
+                            LastForceFailureReasonDesc = reader.IsDBNull(35) ? null : reader.GetString(35),
+                            PlanForcingType = reader.IsDBNull(36) ? null : reader.GetString(36),
+                            CompatibilityLevel = reader.IsDBNull(37) ? null : reader.GetInt16(37)
                         });
                     }
 
@@ -1606,7 +1876,9 @@ public async Task<List<ProcedureExecutionHistoryItem>> GetProcedureStatsHistoryA
             ps.total_logical_reads_delta,
             ps.total_physical_reads_delta,
             ps.total_logical_writes_delta,
-            ps.sample_interval_seconds
+            ps.sample_interval_seconds,
+            sql_handle = CONVERT(varchar(130), ps.sql_handle, 1),
+            plan_handle = CONVERT(varchar(130), ps.plan_handle, 1)
         FROM collect.procedure_stats AS ps
         WHERE ps.database_name = @database_name
         AND   ps.object_id = @object_id
@@ -1667,7 +1939,130 @@ ORDER BY
                             TotalLogicalReadsDelta = reader.IsDBNull(29) ? null : reader.GetInt64(29),
                             TotalPhysicalReadsDelta = reader.IsDBNull(30) ? null : reader.GetInt64(30),
                             TotalLogicalWritesDelta = reader.IsDBNull(31) ? null : reader.GetInt64(31),
-                            SampleIntervalSeconds = reader.IsDBNull(32) ? null : reader.GetInt32(32)
+                            SampleIntervalSeconds = reader.IsDBNull(32) ? null : reader.GetInt32(32),
+                            SqlHandle = reader.IsDBNull(33) ? null : reader.GetString(33),
+                            PlanHandle = reader.IsDBNull(34) ? null : reader.GetString(34)
+                        });
+                    }
+
+                    return items;
+                }
+
+                public async Task<List<ProcedureExecutionHistoryItem>> GetProcedureStatsHistoryAsync(string databaseName, string schemaName, string procedureName, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+                {
+                    var items = new List<ProcedureExecutionHistoryItem>();
+
+                    await using var tc = await OpenThrottledConnectionAsync();
+                    var connection = tc.Connection;
+
+                    var timeFilter = fromDate.HasValue && toDate.HasValue
+                        ? "AND   ps.collection_time >= @from_date AND ps.collection_time <= @to_date"
+                        : "AND   ps.collection_time >= DATEADD(HOUR, -@hours_back, SYSDATETIME())";
+
+                    string query = $@"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        SELECT
+            ps.collection_id,
+            ps.collection_time,
+            ps.server_start_time,
+            ps.object_type,
+            ps.type_desc,
+            ps.cached_time,
+            ps.last_execution_time,
+            ps.execution_count,
+            ps.total_worker_time,
+            ps.min_worker_time,
+            ps.max_worker_time,
+            ps.total_elapsed_time,
+            ps.min_elapsed_time,
+            ps.max_elapsed_time,
+            ps.total_logical_reads,
+            ps.min_logical_reads,
+            ps.max_logical_reads,
+            ps.total_physical_reads,
+            ps.min_physical_reads,
+            ps.max_physical_reads,
+            ps.total_logical_writes,
+            ps.min_logical_writes,
+            ps.max_logical_writes,
+            ps.total_spills,
+            ps.min_spills,
+            ps.max_spills,
+            ps.execution_count_delta,
+            ps.total_worker_time_delta,
+            ps.total_elapsed_time_delta,
+            ps.total_logical_reads_delta,
+            ps.total_physical_reads_delta,
+            ps.total_logical_writes_delta,
+            ps.sample_interval_seconds,
+            sql_handle = CONVERT(varchar(130), ps.sql_handle, 1),
+            plan_handle = CONVERT(varchar(130), ps.plan_handle, 1)
+        FROM collect.procedure_stats AS ps
+        WHERE ps.database_name = @database_name
+        AND   ps.schema_name = @schema_name
+        AND   ps.object_name = @object_name
+        {timeFilter}
+        ORDER BY
+            ps.collection_time DESC;";
+
+                    using var command = new SqlCommand(query, connection);
+                    command.CommandTimeout = 120;
+
+                    command.Parameters.Add(new SqlParameter("@database_name", SqlDbType.NVarChar, 128) { Value = databaseName });
+                    command.Parameters.Add(new SqlParameter("@schema_name", SqlDbType.NVarChar, 128) { Value = schemaName });
+                    command.Parameters.Add(new SqlParameter("@object_name", SqlDbType.NVarChar, 128) { Value = procedureName });
+
+                    if (fromDate.HasValue && toDate.HasValue)
+                    {
+                        command.Parameters.Add(new SqlParameter("@from_date", SqlDbType.DateTime2) { Value = fromDate.Value });
+                        command.Parameters.Add(new SqlParameter("@to_date", SqlDbType.DateTime2) { Value = toDate.Value });
+                    }
+                    else
+                    {
+                        command.Parameters.Add(new SqlParameter("@hours_back", SqlDbType.Int) { Value = hoursBack });
+                    }
+
+                    using var reader = await command.ExecuteReaderAsync();
+                    while (await reader.ReadAsync())
+                    {
+                        items.Add(new ProcedureExecutionHistoryItem
+                        {
+                            CollectionId = reader.GetInt64(0),
+                            CollectionTime = reader.GetDateTime(1),
+                            ServerStartTime = reader.GetDateTime(2),
+                            ObjectType = reader.GetString(3),
+                            TypeDesc = reader.IsDBNull(4) ? null : reader.GetString(4),
+                            CachedTime = reader.GetDateTime(5),
+                            LastExecutionTime = reader.GetDateTime(6),
+                            ExecutionCount = reader.GetInt64(7),
+                            TotalWorkerTime = reader.GetInt64(8),
+                            MinWorkerTime = reader.GetInt64(9),
+                            MaxWorkerTime = reader.GetInt64(10),
+                            TotalElapsedTime = reader.GetInt64(11),
+                            MinElapsedTime = reader.GetInt64(12),
+                            MaxElapsedTime = reader.GetInt64(13),
+                            TotalLogicalReads = reader.GetInt64(14),
+                            MinLogicalReads = reader.GetInt64(15),
+                            MaxLogicalReads = reader.GetInt64(16),
+                            TotalPhysicalReads = reader.GetInt64(17),
+                            MinPhysicalReads = reader.GetInt64(18),
+                            MaxPhysicalReads = reader.GetInt64(19),
+                            TotalLogicalWrites = reader.GetInt64(20),
+                            MinLogicalWrites = reader.GetInt64(21),
+                            MaxLogicalWrites = reader.GetInt64(22),
+                            TotalSpills = reader.IsDBNull(23) ? null : reader.GetInt64(23),
+                            MinSpills = reader.IsDBNull(24) ? null : reader.GetInt64(24),
+                            MaxSpills = reader.IsDBNull(25) ? null : reader.GetInt64(25),
+                            ExecutionCountDelta = reader.IsDBNull(26) ? null : reader.GetInt64(26),
+                            TotalWorkerTimeDelta = reader.IsDBNull(27) ? null : reader.GetInt64(27),
+                            TotalElapsedTimeDelta = reader.IsDBNull(28) ? null : reader.GetInt64(28),
+                            TotalLogicalReadsDelta = reader.IsDBNull(29) ? null : reader.GetInt64(29),
+                            TotalPhysicalReadsDelta = reader.IsDBNull(30) ? null : reader.GetInt64(30),
+                            TotalLogicalWritesDelta = reader.IsDBNull(31) ? null : reader.GetInt64(31),
+                            SampleIntervalSeconds = reader.IsDBNull(32) ? null : reader.GetInt32(32),
+                            SqlHandle = reader.IsDBNull(33) ? null : reader.GetString(33),
+                            PlanHandle = reader.IsDBNull(34) ? null : reader.GetString(34)
                         });
                     }
 
@@ -1732,7 +2127,11 @@ public async Task<List<QueryStatsHistoryItem>> GetQueryStatsHistoryAsync(string
             total_logical_reads_delta = SUM(qs.total_logical_reads_delta),
             total_physical_reads_delta = SUM(qs.total_physical_reads_delta),
             total_logical_writes_delta = SUM(qs.total_logical_writes_delta),
-            sample_interval_seconds = MAX(qs.sample_interval_seconds)
+            sample_interval_seconds = MAX(qs.sample_interval_seconds),
+            sql_handle = CONVERT(varchar(130), MAX(qs.sql_handle), 1),
+            plan_handle = CONVERT(varchar(130), MAX(qs.plan_handle), 1),
+            query_hash = CONVERT(varchar(20), MAX(qs.query_hash), 1),
+            query_plan_hash = CONVERT(varchar(20), MAX(qs.query_plan_hash), 1)
         FROM collect.query_stats AS qs
         WHERE qs.database_name = @database_name
         AND   qs.query_hash = CONVERT(binary(8), @query_hash, 1)
@@ -1806,7 +2205,11 @@ ORDER BY
                             TotalLogicalReadsDelta = reader.IsDBNull(40) ? null : reader.GetInt64(40),
                             TotalPhysicalReadsDelta = reader.IsDBNull(41) ? null : reader.GetInt64(41),
                             TotalLogicalWritesDelta = reader.IsDBNull(42) ? null : reader.GetInt64(42),
-                            SampleIntervalSeconds = reader.IsDBNull(43) ? null : reader.GetInt32(43)
+                            SampleIntervalSeconds = reader.IsDBNull(43) ? null : reader.GetInt32(43),
+                            SqlHandle = reader.IsDBNull(44) ? null : reader.GetString(44),
+                            PlanHandle = reader.IsDBNull(45) ? null : reader.GetString(45),
+                            QueryHash = reader.IsDBNull(46) ? null : reader.GetString(46),
+                            QueryPlanHash = reader.IsDBNull(47) ? null : reader.GetString(47)
                         });
                     }
 
@@ -2416,5 +2819,257 @@ ORDER BY
 
             return items;
         }
+
+        /// <summary>
+        /// Queries dm_exec_requests directly for currently running queries (live snapshot).
+        /// Returns results with query plans in memory for on-demand download.
+        /// </summary>
+        public async Task<List<LiveQueryItem>> GetCurrentActiveQueriesAsync()
+        {
+            var items = new List<LiveQueryItem>();
+
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query = @"
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+SET LOCK_TIMEOUT 1000;
+
+SELECT
+    der.session_id,
+    database_name = DB_NAME(der.database_id),
+    elapsed_time_formatted =
+        CASE
+            WHEN der.total_elapsed_time < 0
+            THEN '00 00:00:00.000'
+            ELSE RIGHT(REPLICATE('0', 2) + CONVERT(varchar(10), der.total_elapsed_time / 86400000), 2) +
+                 ' ' + RIGHT(CONVERT(varchar(30), DATEADD(second, der.total_elapsed_time / 1000, 0), 120), 9) +
+                 '.' + RIGHT('000' + CONVERT(varchar(3), der.total_elapsed_time % 1000), 3)
+        END,
+    query_text = SUBSTRING(dest.text, (der.statement_start_offset / 2) + 1,
+        ((CASE der.statement_end_offset WHEN -1 THEN DATALENGTH(dest.text)
+          ELSE der.statement_end_offset END - der.statement_start_offset) / 2) + 1),
+    query_plan = TRY_CAST(deqp.query_plan AS nvarchar(max)),
+    live_query_plan = deqs.query_plan,
+    der.status,
+    der.blocking_session_id,
+    der.wait_type,
+    wait_time_ms = CONVERT(bigint, der.wait_time),
+    der.wait_resource,
+    cpu_time_ms = CONVERT(bigint, der.cpu_time),
+    total_elapsed_time_ms = CONVERT(bigint, der.total_elapsed_time),
+    der.reads,
+    der.writes,
+    der.logical_reads,
+    granted_query_memory_gb = CONVERT(decimal(38, 2), (der.granted_query_memory / 128. / 1024.)),
+    transaction_isolation_level =
+        CASE der.transaction_isolation_level
+            WHEN 0 THEN 'Unspecified'
+            WHEN 1 THEN 'Read Uncommitted'
+            WHEN 2 THEN 'Read Committed'
+            WHEN 3 THEN 'Repeatable Read'
+            WHEN 4 THEN 'Serializable'
+            WHEN 5 THEN 'Snapshot'
+            ELSE '???'
+        END,
+    der.dop,
+    der.parallel_worker_count,
+    des.login_name,
+    des.host_name,
+    des.program_name,
+    des.open_transaction_count,
+    der.percent_complete
+FROM sys.dm_exec_requests AS der
+JOIN sys.dm_exec_sessions AS des
+    ON des.session_id = der.session_id
+OUTER APPLY sys.dm_exec_sql_text(der.plan_handle) AS dest
+OUTER APPLY sys.dm_exec_text_query_plan(der.plan_handle, der.statement_start_offset, der.statement_end_offset) AS deqp
+OUTER APPLY sys.dm_exec_query_statistics_xml(der.session_id) AS deqs
+WHERE der.session_id <> @@SPID
+AND   der.session_id >= 50
+AND   dest.text IS NOT NULL
+AND   der.database_id <> ISNULL(DB_ID(N'PerformanceMonitor'), 0)
+ORDER BY der.cpu_time DESC, der.parallel_worker_count DESC
+OPTION(MAXDOP 1, RECOMPILE);";
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 30;
+
+            var snapshotTime = DateTime.Now;
+
+            using var reader = await command.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+            {
+                items.Add(new LiveQueryItem
+                {
+                    SnapshotTime = snapshotTime,
+                    SessionId = Convert.ToInt32(reader.GetValue(0)),
+                    DatabaseName = reader.IsDBNull(1) ? null : reader.GetString(1),
+                    ElapsedTimeFormatted = reader.IsDBNull(2) ? string.Empty : reader.GetString(2),
+                    QueryText = reader.IsDBNull(3) ? null : reader.GetString(3),
+                    QueryPlan = reader.IsDBNull(4) ? null : reader.GetString(4),
+                    LiveQueryPlan = reader.IsDBNull(5) ? null : reader.GetValue(5)?.ToString(),
+                    Status = reader.IsDBNull(6) ? null : reader.GetString(6),
+                    BlockingSessionId = reader.IsDBNull(7) ? 0 : Convert.ToInt32(reader.GetValue(7)),
+                    WaitType = reader.IsDBNull(8) ? null : reader.GetString(8),
+                    WaitTimeMs = reader.IsDBNull(9) ? 0 : Convert.ToInt64(reader.GetValue(9)),
+                    WaitResource = reader.IsDBNull(10) ? null : reader.GetString(10),
+                    CpuTimeMs = reader.IsDBNull(11) ? 0 : Convert.ToInt64(reader.GetValue(11)),
+                    TotalElapsedTimeMs = reader.IsDBNull(12) ? 0 : Convert.ToInt64(reader.GetValue(12)),
+                    Reads = reader.IsDBNull(13) ? 0 : Convert.ToInt64(reader.GetValue(13)),
+                    Writes = reader.IsDBNull(14) ? 0 : Convert.ToInt64(reader.GetValue(14)),
+                    LogicalReads = reader.IsDBNull(15) ? 0 : Convert.ToInt64(reader.GetValue(15)),
+                    GrantedQueryMemoryGb = reader.IsDBNull(16) ? 0m : reader.GetDecimal(16),
+                    TransactionIsolationLevel = reader.IsDBNull(17) ? null : reader.GetString(17),
+                    Dop = reader.IsDBNull(18) ? 0 : Convert.ToInt32(reader.GetValue(18)),
+                    ParallelWorkerCount = reader.IsDBNull(19) ? 0 : Convert.ToInt32(reader.GetValue(19)),
+                    LoginName = reader.IsDBNull(20) ? null : reader.GetString(20),
+                    HostName = reader.IsDBNull(21) ? null : reader.GetString(21),
+                    ProgramName = reader.IsDBNull(22) ? null : reader.GetString(22),
+                    OpenTransactionCount = reader.IsDBNull(23) ? 0 : Convert.ToInt32(reader.GetValue(23)),
+                    PercentComplete = reader.IsDBNull(24) ? 0m : reader.GetDecimal(24)
+                });
+            }
+
+            return items;
+        }
+
+        public async Task<List<WaitingTaskTrendItem>> GetWaitingTaskTrendAsync(int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+        {
+            var items = new List<WaitingTaskTrendItem>();
+
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query;
+            if (fromDate.HasValue && toDate.HasValue)
+            {
+                query = @"
+                    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                    SELECT
+                        wt.collection_time,
+                        wt.wait_type,
+                        total_wait_ms = SUM(wt.wait_duration_ms)
+                    FROM collect.waiting_tasks AS wt
+                    WHERE wt.collection_time >= @from_date
+                    AND   wt.collection_time <= @to_date
+                    AND   wt.wait_type IS NOT NULL
+                    GROUP BY
+                        wt.collection_time,
+                        wt.wait_type
+                    ORDER BY
+                        wt.collection_time,
+                        wt.wait_type;";
+            }
+            else
+            {
+                query = @"
+                    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                    SELECT
+                        wt.collection_time,
+                        wt.wait_type,
+                        total_wait_ms = SUM(wt.wait_duration_ms)
+                    FROM collect.waiting_tasks AS wt
+                    WHERE wt.collection_time >= DATEADD(HOUR, @hours_back, SYSDATETIME())
+                    AND   wt.wait_type IS NOT NULL
+                    GROUP BY
+                        wt.collection_time,
+                        wt.wait_type
+                    ORDER BY
+                        wt.collection_time,
+                        wt.wait_type;";
+            }
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 120;
+            command.Parameters.Add(new SqlParameter("@hours_back", SqlDbType.Int) { Value = -hoursBack });
+            if (fromDate.HasValue) command.Parameters.Add(new SqlParameter("@from_date", SqlDbType.DateTime2) { Value = fromDate.Value });
+            if (toDate.HasValue) command.Parameters.Add(new SqlParameter("@to_date", SqlDbType.DateTime2) { Value = toDate.Value });
+
+            using var reader = await command.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+            {
+                items.Add(new WaitingTaskTrendItem
+                {
+                    CollectionTime = reader.GetDateTime(0),
+                    WaitType = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
+                    TotalWaitMs = reader.IsDBNull(2) ? 0L : Convert.ToInt64(reader.GetValue(2), CultureInfo.InvariantCulture)
+                });
+            }
+
+            return items;
+        }
+
+        public async Task<List<BlockedSessionTrendItem>> GetBlockedSessionTrendAsync(int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+        {
+            var items = new List<BlockedSessionTrendItem>();
+
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query;
+            if (fromDate.HasValue && toDate.HasValue)
+            {
+                query = @"
+                    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                    SELECT
+                        wt.collection_time,
+                        wt.database_name,
+                        blocked_count = COUNT(*)
+                    FROM collect.waiting_tasks AS wt
+                    WHERE wt.blocking_session_id > 0
+                    AND   wt.collection_time >= @from_date
+                    AND   wt.collection_time <= @to_date
+                    AND   wt.database_name IS NOT NULL
+                    GROUP BY
+                        wt.collection_time,
+                        wt.database_name
+                    ORDER BY
+                        wt.collection_time,
+                        wt.database_name;";
+            }
+            else
+            {
+                query = @"
+                    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                    SELECT
+                        wt.collection_time,
+                        wt.database_name,
+                        blocked_count = COUNT(*)
+                    FROM collect.waiting_tasks AS wt
+                    WHERE wt.blocking_session_id > 0
+                    AND   wt.collection_time >= DATEADD(HOUR, @hours_back, SYSDATETIME())
+                    AND   wt.database_name IS NOT NULL
+                    GROUP BY
+                        wt.collection_time,
+                        wt.database_name
+                    ORDER BY
+                        wt.collection_time,
+                        wt.database_name;";
+            }
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 120;
+            command.Parameters.Add(new SqlParameter("@hours_back", SqlDbType.Int) { Value = -hoursBack });
+            if (fromDate.HasValue) command.Parameters.Add(new SqlParameter("@from_date", SqlDbType.DateTime2) { Value = fromDate.Value });
+            if (toDate.HasValue) command.Parameters.Add(new SqlParameter("@to_date", SqlDbType.DateTime2) { Value = toDate.Value });
+
+            using var reader = await command.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+            {
+                items.Add(new BlockedSessionTrendItem
+                {
+                    CollectionTime = reader.GetDateTime(0),
+                    DatabaseName = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
+                    BlockedCount = reader.IsDBNull(2) ? 0 : Convert.ToInt32(reader.GetValue(2), CultureInfo.InvariantCulture)
+                });
+            }
+
+            return items;
+        }
     }
 }
diff --git a/Dashboard/Services/DatabaseService.ResourceMetrics.cs b/Dashboard/Services/DatabaseService.ResourceMetrics.cs
index 5bead59f..a6b2bc23 100644
--- a/Dashboard/Services/DatabaseService.ResourceMetrics.cs
+++ b/Dashboard/Services/DatabaseService.ResourceMetrics.cs
@@ -1379,6 +1379,18 @@ WHEN ISNULL(fio.num_of_writes_delta, 0) > 0
                     THEN CONVERT(decimal(19,2), fio.io_stall_write_ms_delta * 1.0 / fio.num_of_writes_delta)
                     ELSE 0
                 END,
+            read_queued_latency_ms =
+                CASE
+                    WHEN ISNULL(fio.num_of_reads_delta, 0) > 0
+                    THEN CONVERT(decimal(19,2), ISNULL(fio.io_stall_queued_read_ms_delta, 0) * 1.0 / fio.num_of_reads_delta)
+                    ELSE 0
+                END,
+            write_queued_latency_ms =
+                CASE
+                    WHEN ISNULL(fio.num_of_writes_delta, 0) > 0
+                    THEN CONVERT(decimal(19,2), ISNULL(fio.io_stall_queued_write_ms_delta, 0) * 1.0 / fio.num_of_writes_delta)
+                    ELSE 0
+                END,
             read_count = ISNULL(fio.num_of_reads_delta, 0),
             write_count = ISNULL(fio.num_of_writes_delta, 0)
         FROM collect.file_io_stats AS fio
@@ -1392,10 +1404,10 @@ ORDER BY
             fio.collection_time,
             fio.database_name,
             fio.file_name;";
-        
+
                     using var command = new SqlCommand(query, connection);
                     command.CommandTimeout = 120;
-        
+
                     if (fromDate.HasValue && toDate.HasValue)
                     {
                         command.Parameters.Add(new SqlParameter("@fromDate", SqlDbType.DateTime2) { Value = fromDate.Value });
@@ -1405,7 +1417,7 @@ ORDER BY
                     {
                         command.Parameters.Add(new SqlParameter("@hoursBack", SqlDbType.Int) { Value = hoursBack });
                     }
-        
+
                     using var reader = await command.ExecuteReaderAsync();
                     while (await reader.ReadAsync())
                     {
@@ -1417,11 +1429,124 @@ ORDER BY
                             FileType = reader.IsDBNull(3) ? string.Empty : reader.GetString(3),
                             ReadLatencyMs = reader.IsDBNull(4) ? 0m : reader.GetDecimal(4),
                             WriteLatencyMs = reader.IsDBNull(5) ? 0m : reader.GetDecimal(5),
+                            ReadQueuedLatencyMs = reader.IsDBNull(6) ? 0m : reader.GetDecimal(6),
+                            WriteQueuedLatencyMs = reader.IsDBNull(7) ? 0m : reader.GetDecimal(7),
+                            ReadCount = reader.IsDBNull(8) ? 0 : reader.GetInt64(8),
+                            WriteCount = reader.IsDBNull(9) ? 0 : reader.GetInt64(9)
+                        });
+                    }
+        
+                    return items;
+                }
+
+                public async Task<List<FileIoLatencyTimeSeriesItem>> GetFileIoThroughputTimeSeriesAsync(bool isTempDb, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+                {
+                    var items = new List<FileIoLatencyTimeSeriesItem>();
+
+                    await using var tc = await OpenThrottledConnectionAsync();
+                    var connection = tc.Connection;
+
+                    string dateFilter = fromDate.HasValue && toDate.HasValue
+                        ? "AND fio.collection_time >= @fromDate AND fio.collection_time <= @toDate"
+                        : "AND fio.collection_time >= DATEADD(HOUR, -@hoursBack, SYSDATETIME())";
+
+                    string dbFilter = isTempDb
+                        ? "AND fio.database_name = N'tempdb'"
+                        : "AND fio.database_name <> N'tempdb'";
+
+                    string query = $@"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        WITH
+            file_avg_throughput AS
+        (
+            SELECT
+                fio.database_name,
+                fio.file_name,
+                fio.file_type_desc,
+                total_bytes = SUM(ISNULL(fio.num_of_bytes_read_delta, 0)) + SUM(ISNULL(fio.num_of_bytes_written_delta, 0)),
+                total_io = SUM(ISNULL(fio.num_of_reads_delta, 0)) + SUM(ISNULL(fio.num_of_writes_delta, 0))
+            FROM collect.file_io_stats AS fio
+            WHERE fio.database_name IS NOT NULL
+            {dbFilter}
+            {dateFilter}
+            GROUP BY
+                fio.database_name,
+                fio.file_name,
+                fio.file_type_desc
+            HAVING
+                SUM(ISNULL(fio.num_of_bytes_read_delta, 0)) + SUM(ISNULL(fio.num_of_bytes_written_delta, 0)) > 0
+        ),
+            top_files AS
+        (
+            SELECT TOP (10)
+                fat.database_name,
+                fat.file_name,
+                fat.file_type_desc
+            FROM file_avg_throughput AS fat
+            ORDER BY
+                fat.total_bytes DESC
+        )
+        SELECT
+            fio.collection_time,
+            fio.database_name,
+            fio.file_name,
+            fio.file_type_desc,
+            read_throughput_mb_per_sec =
+                CASE
+                    WHEN ISNULL(fio.sample_ms_delta, 0) > 0
+                    THEN CONVERT(decimal(19,4), fio.num_of_bytes_read_delta * 1000.0 / fio.sample_ms_delta / 1048576.0)
+                    ELSE 0
+                END,
+            write_throughput_mb_per_sec =
+                CASE
+                    WHEN ISNULL(fio.sample_ms_delta, 0) > 0
+                    THEN CONVERT(decimal(19,4), fio.num_of_bytes_written_delta * 1000.0 / fio.sample_ms_delta / 1048576.0)
+                    ELSE 0
+                END,
+            read_count = ISNULL(fio.num_of_reads_delta, 0),
+            write_count = ISNULL(fio.num_of_writes_delta, 0)
+        FROM collect.file_io_stats AS fio
+        JOIN top_files AS tf
+          ON  tf.database_name = fio.database_name
+          AND tf.file_name = fio.file_name
+        WHERE fio.database_name IS NOT NULL
+        {dbFilter}
+        {dateFilter}
+        ORDER BY
+            fio.collection_time,
+            fio.database_name,
+            fio.file_name;";
+
+                    using var command = new SqlCommand(query, connection);
+                    command.CommandTimeout = 120;
+
+                    if (fromDate.HasValue && toDate.HasValue)
+                    {
+                        command.Parameters.Add(new SqlParameter("@fromDate", SqlDbType.DateTime2) { Value = fromDate.Value });
+                        command.Parameters.Add(new SqlParameter("@toDate", SqlDbType.DateTime2) { Value = toDate.Value });
+                    }
+                    else
+                    {
+                        command.Parameters.Add(new SqlParameter("@hoursBack", SqlDbType.Int) { Value = hoursBack });
+                    }
+
+                    using var reader = await command.ExecuteReaderAsync();
+                    while (await reader.ReadAsync())
+                    {
+                        items.Add(new FileIoLatencyTimeSeriesItem
+                        {
+                            CollectionTime = reader.GetDateTime(0),
+                            DatabaseName = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
+                            FileName = reader.IsDBNull(2) ? string.Empty : reader.GetString(2),
+                            FileType = reader.IsDBNull(3) ? string.Empty : reader.GetString(3),
+                            ReadThroughputMbPerSec = reader.IsDBNull(4) ? 0m : reader.GetDecimal(4),
+                            WriteThroughputMbPerSec = reader.IsDBNull(5) ? 0m : reader.GetDecimal(5),
                             ReadCount = reader.IsDBNull(6) ? 0 : reader.GetInt64(6),
                             WriteCount = reader.IsDBNull(7) ? 0 : reader.GetInt64(7)
                         });
                     }
-        
+
                     return items;
                 }
 
diff --git a/Dashboard/Services/DatabaseService.cs b/Dashboard/Services/DatabaseService.cs
index f255a10b..c5dfb36e 100644
--- a/Dashboard/Services/DatabaseService.cs
+++ b/Dashboard/Services/DatabaseService.cs
@@ -32,6 +32,11 @@ public DatabaseService(string connectionString)
             _connectionString = connectionString;
         }
 
+        /// <summary>
+        /// The connection string used by this service (for re-use by actual plan execution).
+        /// </summary>
+        public string ConnectionString => _connectionString;
+
         /// <summary>
         /// Opens a throttled database connection. The semaphore is released when the connection is disposed.
         /// </summary>
@@ -180,6 +185,48 @@ CASE health_status
             return items;
         }
 
+        public async Task<List<CollectionLogEntry>> GetCollectionDurationLogsAsync(int hoursBack = 24)
+        {
+            var items = new List<CollectionLogEntry>();
+
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query = @"
+                SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+                SELECT
+                    collector_name,
+                    collection_time,
+                    duration_ms
+                FROM config.collection_log
+                WHERE collection_status = 'SUCCESS'
+                    AND duration_ms IS NOT NULL
+                    AND collection_time >= DATEADD(HOUR, -@hours_back, GETUTCDATE())
+                ORDER BY
+                    collection_time;";
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 120;
+            command.Parameters.Add(new SqlParameter("@hours_back", SqlDbType.Int) { Value = hoursBack });
+
+            using (StartQueryTiming("Collection Duration Logs", query, connection))
+            {
+                using var reader = await command.ExecuteReaderAsync();
+                while (await reader.ReadAsync())
+                {
+                    items.Add(new CollectionLogEntry
+                    {
+                        CollectorName = reader.GetString(0),
+                        CollectionTime = reader.GetDateTime(1),
+                        DurationMs = reader.GetInt32(2)
+                    });
+                }
+            }
+
+            return items;
+        }
+
         // ============================================
         // Helper Methods for Safe Type Conversion
         // ============================================
diff --git a/Dashboard/Services/PlanAnalyzer.cs b/Dashboard/Services/PlanAnalyzer.cs
new file mode 100644
index 00000000..89a65683
--- /dev/null
+++ b/Dashboard/Services/PlanAnalyzer.cs
@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using PerformanceMonitorDashboard.Models;
+
+namespace PerformanceMonitorDashboard.Services;
+
+/// <summary>
+/// Post-parse analysis pass that walks a parsed plan tree and adds warnings
+/// for common performance anti-patterns. Called after ShowPlanParser.Parse().
+/// </summary>
+public static class PlanAnalyzer
+{
+    public static void Analyze(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var stmt in batch.Statements)
+            {
+                AnalyzeStatement(stmt);
+
+                if (stmt.RootNode != null)
+                    AnalyzeNodeTree(stmt.RootNode);
+            }
+        }
+    }
+
+    private static void AnalyzeStatement(PlanStatement stmt)
+    {
+        // Rule 3: Serial plan with reason
+        if (!string.IsNullOrEmpty(stmt.NonParallelPlanReason))
+        {
+            var reason = stmt.NonParallelPlanReason switch
+            {
+                "MaxDOPSetToOne" => "MAXDOP is set to 1",
+                "EstimatedDOPIsOne" => "Estimated DOP is 1",
+                "NoParallelPlansInDesktopOrExpressEdition" => "Express/Desktop edition does not support parallelism",
+                "CouldNotGenerateValidParallelPlan" => "Optimizer could not generate a valid parallel plan",
+                "QueryHintNoParallelSet" => "OPTION (MAXDOP 1) hint forces serial execution",
+                _ => stmt.NonParallelPlanReason
+            };
+
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Serial Plan",
+                Message = $"Query forced to run serially: {reason}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 9: Memory grant issues (statement-level)
+        if (stmt.MemoryGrant != null)
+        {
+            var grant = stmt.MemoryGrant;
+
+            // Excessive grant — granted far more than actually used
+            if (grant.GrantedMemoryKB > 0 && grant.MaxUsedMemoryKB > 0)
+            {
+                var wasteRatio = (double)grant.GrantedMemoryKB / grant.MaxUsedMemoryKB;
+                if (wasteRatio >= 10 && grant.GrantedMemoryKB > 1024)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Excessive Memory Grant",
+                        Message = $"Granted {grant.GrantedMemoryKB:N0} KB but only used {grant.MaxUsedMemoryKB:N0} KB ({wasteRatio:F0}x overestimate). Wasted memory blocks other queries.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+
+            // Grant wait — query had to wait for memory
+            if (grant.GrantWaitTimeMs > 0)
+            {
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "Memory Grant Wait",
+                    Message = $"Query waited {grant.GrantWaitTimeMs:N0}ms for a memory grant. Server may be under memory pressure.",
+                    Severity = grant.GrantWaitTimeMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+    }
+
+    private static void AnalyzeNodeTree(PlanNode node)
+    {
+        AnalyzeNode(node);
+
+        foreach (var child in node.Children)
+            AnalyzeNodeTree(child);
+    }
+
+    private static void AnalyzeNode(PlanNode node)
+    {
+        // Rule 1: Filter operators — rows survived the tree just to be discarded
+        if (node.PhysicalOp == "Filter" && !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Filter Operator",
+                Message = $"Filter discards rows late in the plan. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 2: Eager Index Spools — optimizer building temporary indexes on the fly
+        if (node.LogicalOp == "Eager Spool" &&
+            node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
+        {
+            var message = "Optimizer is building a temporary index at runtime. A permanent index may help.";
+            if (!string.IsNullOrEmpty(node.SuggestedIndex))
+                message += $"\n\nSuggested index:\n{node.SuggestedIndex}";
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Eager Index Spool",
+                Message = message,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 4: UDF timing — any node spending time in UDFs (actual plans)
+        if (node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+        {
+            var cpuMs = node.UdfCpuTimeUs / 1000.0;
+            var elapsedMs = node.UdfElapsedTimeUs / 1000.0;
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "UDF Execution",
+                Message = $"Scalar UDF executing on this operator. UDF elapsed: {elapsedMs:F1}ms, UDF CPU: {cpuMs:F1}ms",
+                Severity = elapsedMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 5: Large estimate vs actual row gaps (actual plans only)
+        if (node.HasActualStats && node.EstimateRows > 0)
+        {
+            var ratio = node.ActualRows / node.EstimateRows;
+            if (ratio >= 10.0 || ratio <= 0.1)
+            {
+                var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
+                var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Row Estimate Mismatch",
+                    Message = $"Estimated {node.EstimateRows:N0} rows, actual {node.ActualRows:N0} ({factor:F0}x {direction}). May cause poor plan choices.",
+                    Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 6: Scalar UDF references (works on estimated plans too)
+        foreach (var udf in node.ScalarUdfs)
+        {
+            var type = udf.IsClrFunction ? "CLR" : "T-SQL";
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Scalar UDF",
+                Message = $"Scalar {type} UDF reference: {udf.FunctionName}. Scalar UDFs execute row-by-row and prevent parallelism.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 7: Spill detection — promote severity for large spills
+        foreach (var w in node.Warnings.ToList())
+        {
+            if (w.SpillDetails != null && w.SpillDetails.WritesToTempDb > 1000)
+                w.Severity = PlanWarningSeverity.Critical;
+        }
+
+        // Rule 8: Parallel thread skew (actual plans with per-thread stats)
+        if (node.PerThreadStats.Count > 1)
+        {
+            var totalRows = node.PerThreadStats.Sum(t => t.ActualRows);
+            if (totalRows > 0)
+            {
+                var maxThread = node.PerThreadStats.OrderByDescending(t => t.ActualRows).First();
+                var skewRatio = (double)maxThread.ActualRows / totalRows;
+                if (skewRatio >= 0.9 && node.PerThreadStats.Count >= 4)
+                {
+                    node.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Parallel Skew",
+                        Message = $"Thread {maxThread.ThreadId} processed {skewRatio:P0} of rows ({maxThread.ActualRows:N0}/{totalRows:N0}). Work is heavily skewed to one thread.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 10: Key Lookup with residual predicate
+        if (node.Lookup && !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Key Lookup",
+                Message = $"Key Lookup with residual predicate. A covering index may eliminate this lookup. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 11: Scan with residual predicate (not spools)
+        if (node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
+            !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
+            !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Scan With Predicate",
+                Message = $"Scan filtering rows with a residual predicate. An index on the predicate columns may help. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+    }
+
+    private static string Truncate(string value, int maxLength)
+    {
+        return value.Length <= maxLength ? value : value[..maxLength] + "...";
+    }
+}
diff --git a/Dashboard/Services/PlanIconMapper.cs b/Dashboard/Services/PlanIconMapper.cs
new file mode 100644
index 00000000..659a9014
--- /dev/null
+++ b/Dashboard/Services/PlanIconMapper.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Media.Imaging;
+
+namespace PerformanceMonitorDashboard.Services;
+
+public static class PlanIconMapper
+{
+    private static readonly Dictionary<string, BitmapImage> _iconCache = new();
+
+    // PhysicalOp (with spaces) → icon filename (without .png)
+    private static readonly Dictionary<string, string> IconMap = new(StringComparer.OrdinalIgnoreCase)
+    {
+        // Join operators
+        ["Adaptive Join"] = "adaptive_join",
+        ["Hash Match"] = "hash_match",
+        ["Merge Join"] = "merge_join",
+        ["Nested Loops"] = "nested_loops",
+
+        // Index operations
+        ["Clustered Index Delete"] = "clustered_index_delete",
+        ["Clustered Index Insert"] = "clustered_index_insert",
+        ["Clustered Index Merge"] = "clustered_index_merge",
+        ["Clustered Index Scan"] = "clustered_index_scan",
+        ["Clustered Index Seek"] = "clustered_index_seek",
+        ["Clustered Index Update"] = "clustered_index_update",
+        ["Clustered Update"] = "clustered_update",
+        ["Index Delete"] = "index_delete",
+        ["Index Insert"] = "index_insert",
+        ["Index Scan"] = "index_scan",
+        ["Index Seek"] = "index_seek",
+        ["Index Spool"] = "index_spool",
+        ["Index Update"] = "index_update",
+
+        // Columnstore
+        ["Columnstore Index Delete"] = "columnstore_index_delete",
+        ["Columnstore Index Insert"] = "columnstore_index_insert",
+        ["Columnstore Index Merge"] = "columnstore_index_merge",
+        ["Columnstore Index Scan"] = "columnstore_index_scan",
+        ["Columnstore Index Update"] = "columnstore_index_update",
+
+        // Scan operators
+        ["Table Scan"] = "table_scan",
+        ["Constant Scan"] = "constant_scan",
+        ["Deleted Scan"] = "deleted_scan",
+        ["Inserted Scan"] = "inserted_scan",
+        ["Log Row Scan"] = "log_row_scan",
+        ["Parameter Table Scan"] = "parameter_table_scan",
+
+        // Table DML
+        ["Table Delete"] = "table_delete",
+        ["Table Insert"] = "table_insert",
+        ["Table Merge"] = "table_merge",
+        ["Table Update"] = "table_update",
+
+        // Lookup
+        ["Key Lookup"] = "bookmark_lookup",
+        ["RID Lookup"] = "rid_lookup",
+        ["Bookmark Lookup"] = "bookmark_lookup",
+
+        // Aggregation
+        ["Stream Aggregate"] = "stream_aggregate",
+        ["Window Aggregate"] = "window_aggregate",
+        ["Group By Aggregate"] = "group_by_aggregate",
+
+        // Scalar / compute
+        ["Compute Scalar"] = "compute_scalar",
+        ["Filter"] = "filter",
+        ["Assert"] = "assert",
+
+        // Sort / top
+        ["Sort"] = "sort",
+        ["Top"] = "top",
+
+        // Spool
+        ["Table Spool"] = "table_spool",
+        ["Row Count Spool"] = "row_count_spool",
+        ["Window Spool"] = "table_spool",
+        ["Eager Spool"] = "table_spool",
+        ["Lazy Spool"] = "table_spool",
+        ["Spool"] = "spool",
+
+        // Set operations
+        ["Concatenation"] = "concatenation",
+        ["Union"] = "union",
+        ["Union All"] = "union_all",
+
+        // Parallelism
+        ["Parallelism"] = "parallelism",
+        ["Distribute Streams"] = "parallelism",
+        ["Gather Streams"] = "parallelism",
+        ["Repartition Streams"] = "parallelism",
+
+        // Remote
+        ["Remote Query"] = "remote_query",
+        ["Remote Scan"] = "remote_scan",
+        ["Remote Index Scan"] = "remote_index_scan",
+        ["Remote Index Seek"] = "remote_index_seek",
+        ["Remote Insert"] = "remote_insert",
+        ["Remote Delete"] = "remote_delete",
+        ["Remote Update"] = "remote_update",
+
+        // Miscellaneous
+        ["Bitmap"] = "bitmap",
+        ["Batch Hash Table Build"] = "batch_hash_table_build",
+        ["Collapse"] = "collapse",
+        ["Distinct"] = "sort",
+        ["Foreign Key References Check"] = "foreign_key_references_check",
+        ["Merge Interval"] = "merge_interval",
+        ["Print"] = "print",
+        ["Rank"] = "rank",
+        ["Segment"] = "segment",
+        ["Sequence"] = "sequence",
+        ["Sequence Project"] = "sequence_project",
+        ["Split"] = "split",
+        ["Switch"] = "switch",
+        ["Table-valued function"] = "table_valued_function",
+        ["UDX"] = "udx",
+        ["Predict"] = "predict",
+        ["Apply"] = "apply",
+
+        // PDW / distributed
+        ["Broadcast"] = "broadcast",
+        ["Compute To Control Node"] = "compute_to_control_node",
+        ["Const Table Get"] = "const_table_get",
+        ["Control To Compute Nodes"] = "control_to_compute_nodes",
+        ["External Broadcast"] = "external_broadcast",
+        ["External Export"] = "external_export",
+        ["External Local Streaming"] = "external_local_streaming",
+        ["External Round Robin"] = "external_round_robin",
+        ["External Shuffle"] = "external_shuffle",
+        ["Get"] = "get",
+        ["Group By Apply"] = "apply",
+        ["Join"] = "join",
+        ["Project"] = "project",
+        ["Shuffle"] = "shuffle",
+        ["Single Source Round Robin"] = "single_source_round_robin",
+        ["Single Source Shuffle"] = "single_source_shuffle",
+        ["Trim"] = "trim",
+
+        // Cursor operators
+        ["Fetch Query"] = "fetch_query",
+        ["Population Query"] = "population_query",
+        ["Refresh Query"] = "refresh_query",
+
+        // Legacy / Shiloh
+        ["Result"] = "result",
+        ["Aggregate"] = "aggregate",
+        ["Assign"] = "assign",
+        ["Arithmetic Expression"] = "arithmetic_expression",
+        ["Convert"] = "convert",
+        ["Declare"] = "declare",
+        ["Delete"] = "delete",
+        ["Dynamic"] = "dynamic",
+        ["Hash Match Root"] = "hash_match_root",
+        ["Hash Match Team"] = "hash_match_team",
+        ["If"] = "if",
+        ["Insert"] = "insert",
+        ["Intrinsic"] = "intrinsic",
+        ["Keyset"] = "keyset",
+        ["Locate"] = "locate",
+        ["Set Function"] = "set_function",
+        ["Snapshot"] = "snapshot",
+        ["TSQL"] = "sql",
+        ["Update"] = "update",
+
+        // Catch-all
+        ["Cursor Catch All"] = "cursor_catch_all",
+        ["Language Construct Catch All"] = "language_construct_catch_all",
+    };
+
+    public static string GetIconName(string physicalOp)
+    {
+        if (IconMap.TryGetValue(physicalOp, out var iconName))
+            return iconName;
+
+        // Try removing spaces as fallback
+        var normalized = physicalOp.Replace(" ", "_").ToLowerInvariant();
+        return normalized;
+    }
+
+    public static BitmapImage? GetIcon(string iconName)
+    {
+        if (_iconCache.TryGetValue(iconName, out var cached))
+            return cached;
+
+        try
+        {
+            var uri = new Uri($"pack://application:,,,/Resources/PlanIcons/{iconName}.png", UriKind.Absolute);
+            var bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = uri;
+            bitmap.CacheOption = BitmapCacheOption.OnLoad;
+            bitmap.DecodePixelWidth = 32;
+            bitmap.EndInit();
+            bitmap.Freeze();
+            _iconCache[iconName] = bitmap;
+            return bitmap;
+        }
+        catch
+        {
+            // Try fallback icon
+            if (iconName != "iterator_catch_all")
+                return GetIcon("iterator_catch_all");
+            return null;
+        }
+    }
+}
diff --git a/Dashboard/Services/PlanLayoutEngine.cs b/Dashboard/Services/PlanLayoutEngine.cs
new file mode 100644
index 00000000..da36b92e
--- /dev/null
+++ b/Dashboard/Services/PlanLayoutEngine.cs
@@ -0,0 +1,102 @@
+using System;
+using PerformanceMonitorDashboard.Models;
+
+namespace PerformanceMonitorDashboard.Services;
+
+public static class PlanLayoutEngine
+{
+    public const double NodeWidth = 150;
+    public const double HorizontalSpacing = 180;
+    public const double VerticalSpacing = 24;
+    public const double Padding = 40;
+
+    /* Per-line heights matching CreateNodeVisual font sizes + WPF line spacing */
+    private const double IconRowHeight = 36;  /* 32px icon + 2px margin + 2px spacing */
+    private const double Line10 = 17;         /* FontSize 10 text block */
+    private const double Line9 = 15;          /* FontSize 9 text block */
+    private const double NodePadding = 12;    /* Border padding (4+4) + border thickness */
+
+    /// <summary>
+    /// Minimum node height (estimated plans without actual stats or object name).
+    /// </summary>
+    public const double NodeHeightMin = 90;
+
+    public static void Layout(PlanStatement statement)
+    {
+        if (statement.RootNode == null) return;
+
+        // Phase 1: X positions by tree depth (root at left, children to the right)
+        SetXPositions(statement.RootNode, 0);
+
+        // Phase 2: Y positions with overlap prevention
+        double nextY = Padding;
+        SetYPositions(statement.RootNode, ref nextY);
+    }
+
+    public static (double width, double height) GetExtents(PlanNode root)
+    {
+        double maxX = 0, maxBottom = 0;
+        CollectExtents(root, ref maxX, ref maxBottom);
+        return (maxX + NodeWidth + Padding, maxBottom + Padding);
+    }
+
+    /// <summary>
+    /// Calculates the expected rendered height of a node based on its content.
+    /// Matches the lines emitted by CreateNodeVisual in PlanViewerControl.
+    /// </summary>
+    public static double GetNodeHeight(PlanNode node)
+    {
+        double h = IconRowHeight + Line10 + Line10 + NodePadding; /* icon + name + cost + padding */
+
+        if (node.HasActualStats)
+        {
+            h += Line10;  /* elapsed time */
+            h += Line9;   /* CPU time */
+            h += Line9;   /* actual/estimated rows */
+        }
+
+        if (!string.IsNullOrEmpty(node.ObjectName))
+        {
+            h += Line9;   /* object name */
+        }
+
+        return Math.Max(h, NodeHeightMin);
+    }
+
+    private static void SetXPositions(PlanNode node, int depth)
+    {
+        node.X = Padding + depth * HorizontalSpacing;
+
+        foreach (var child in node.Children)
+            SetXPositions(child, depth + 1);
+    }
+
+    private static void SetYPositions(PlanNode node, ref double nextY)
+    {
+        if (node.Children.Count == 0)
+        {
+            // Leaf node: place at the next available Y position
+            node.Y = nextY;
+            nextY += GetNodeHeight(node) + VerticalSpacing;
+            return;
+        }
+
+        // Process children first (post-order)
+        foreach (var child in node.Children)
+            SetYPositions(child, ref nextY);
+
+        // SSMS-style: parent aligns with first child (creates horizontal spine)
+        node.Y = node.Children[0].Y;
+    }
+
+    private static void CollectExtents(PlanNode node, ref double maxX, ref double maxBottom)
+    {
+        if (node.X > maxX) maxX = node.X;
+
+        var bottom = node.Y + GetNodeHeight(node);
+        if (bottom > maxBottom) maxBottom = bottom;
+
+        foreach (var child in node.Children)
+            CollectExtents(child, ref maxX, ref maxBottom);
+    }
+}
diff --git a/Dashboard/Services/ReproScriptBuilder.cs b/Dashboard/Services/ReproScriptBuilder.cs
index 76556e99..3605db3e 100644
--- a/Dashboard/Services/ReproScriptBuilder.cs
+++ b/Dashboard/Services/ReproScriptBuilder.cs
@@ -30,7 +30,8 @@ public static string BuildReproScript(
         string? databaseName,
         string? planXml,
         string? isolationLevel,
-        string source = "Query")
+        string source = "Query",
+        bool isAzureSqlDb = false)
     {
         var sb = new StringBuilder();
         var warnings = new List<string>();
@@ -95,19 +96,30 @@ public static string BuildReproScript(
         sb.AppendLine("*/");
         sb.AppendLine();
 
-        /* USE database */
-        if (!string.IsNullOrEmpty(databaseName))
+        /* USE database (skip for Azure SQL DB — USE is invalid there) */
+        if (!string.IsNullOrEmpty(databaseName) && !isAzureSqlDb)
         {
             sb.AppendLine($"USE [{databaseName}];");
             sb.AppendLine();
         }
 
-        /* SET options */
+        /* SET options from plan XML (match the query's original execution context) */
+        if (!string.IsNullOrEmpty(planXml))
+        {
+            var setOptions = ExtractSetOptionsFromPlan(planXml);
+            if (setOptions.Count > 0)
+            {
+                foreach (var setOption in setOptions)
+                {
+                    sb.AppendLine(setOption);
+                }
+            }
+        }
+
         if (!string.IsNullOrEmpty(isolationLevel))
         {
             sb.AppendLine($"SET TRANSACTION ISOLATION LEVEL {isolationLevel.ToUpperInvariant()};");
         }
-        sb.AppendLine("SET STATISTICS XML OFF;");
         sb.AppendLine("SET NOCOUNT ON;");
         sb.AppendLine();
 
@@ -259,6 +271,52 @@ public static List<QueryParameter> ExtractParametersFromPlan(string planXml)
         return parameters;
     }
 
+    /// <summary>
+    /// Extracts StatementSetOptions from plan XML and returns ordered SET statements.
+    /// These match the execution context the query was originally compiled under.
+    /// </summary>
+    private static List<string> ExtractSetOptionsFromPlan(string planXml)
+    {
+        var setStatements = new List<string>();
+
+        try
+        {
+            var doc = XDocument.Parse(planXml);
+            XNamespace ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
+
+            var setOptsEl = doc.Descendants(ns + "StatementSetOptions").FirstOrDefault();
+            if (setOptsEl == null) return setStatements;
+
+            /* Emit in conventional order matching SSMS/plan explorer output */
+            var options = new (string Attribute, string SetName)[]
+            {
+                ("ANSI_NULLS", "ANSI_NULLS"),
+                ("ANSI_PADDING", "ANSI_PADDING"),
+                ("ANSI_WARNINGS", "ANSI_WARNINGS"),
+                ("ARITHABORT", "ARITHABORT"),
+                ("CONCAT_NULL_YIELDS_NULL", "CONCAT_NULL_YIELDS_NULL"),
+                ("QUOTED_IDENTIFIER", "QUOTED_IDENTIFIER"),
+                ("NUMERIC_ROUNDABORT", "NUMERIC_ROUNDABORT"),
+            };
+
+            foreach (var (attr, setName) in options)
+            {
+                var value = setOptsEl.Attribute(attr)?.Value;
+                if (value != null)
+                {
+                    var onOff = value is "true" or "1" ? "ON" : "OFF";
+                    setStatements.Add($"SET {setName} {onOff};");
+                }
+            }
+        }
+        catch
+        {
+            /* Plan XML parse failure — return empty list, SET options are best-effort */
+        }
+
+        return setStatements;
+    }
+
     /// <summary>
     /// Strips the parameter declaration prefix from query text captured via sp_executesql.
     /// Query text like "(@p1 int, @p2 nvarchar(50))SELECT ..." becomes "SELECT ...".
diff --git a/Dashboard/Services/ServerManager.cs b/Dashboard/Services/ServerManager.cs
index 9d1ad8c5..3fcba888 100644
--- a/Dashboard/Services/ServerManager.cs
+++ b/Dashboard/Services/ServerManager.cs
@@ -140,6 +140,42 @@ public void DeleteServer(string id)
             }
         }
 
+        public async Task DropMonitorDatabaseAsync(ServerConnection server)
+        {
+            var connectionString = server.GetConnectionString(_credentialService);
+            var builder = new SqlConnectionStringBuilder(connectionString)
+            {
+                InitialCatalog = "master",
+                ConnectTimeout = 10
+            };
+
+            using var connection = new SqlConnection(builder.ConnectionString);
+            await connection.OpenAsync();
+
+            // Remove SQL Agent jobs before dropping the database
+            using var jobCmd = new SqlCommand(@"
+                IF EXISTS (SELECT 1 FROM msdb.dbo.sysjobs WHERE name = N'PerformanceMonitor - Collection')
+                    EXEC msdb.dbo.sp_delete_job @job_name = N'PerformanceMonitor - Collection', @delete_unused_schedule = 1;
+                IF EXISTS (SELECT 1 FROM msdb.dbo.sysjobs WHERE name = N'PerformanceMonitor - Data Retention')
+                    EXEC msdb.dbo.sp_delete_job @job_name = N'PerformanceMonitor - Data Retention', @delete_unused_schedule = 1;
+                IF EXISTS (SELECT 1 FROM msdb.dbo.sysjobs WHERE name = N'PerformanceMonitor - Hung Job Monitor')
+                    EXEC msdb.dbo.sp_delete_job @job_name = N'PerformanceMonitor - Hung Job Monitor', @delete_unused_schedule = 1;", connection);
+            jobCmd.CommandTimeout = 30;
+            await jobCmd.ExecuteNonQueryAsync();
+
+            // Close active connections before dropping
+            using var killCmd = new SqlCommand(@"
+                IF DB_ID('PerformanceMonitor') IS NOT NULL
+                BEGIN
+                    ALTER DATABASE [PerformanceMonitor] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
+                    DROP DATABASE [PerformanceMonitor];
+                END", connection);
+            killCmd.CommandTimeout = 30;
+            await killCmd.ExecuteNonQueryAsync();
+
+            Logger.Info($"Dropped PerformanceMonitor database and Agent jobs on '{server.DisplayName}'");
+        }
+
         public void UpdateLastConnected(string id)
         {
             lock (_serversLock)
diff --git a/Dashboard/Services/ShowPlanParser.cs b/Dashboard/Services/ShowPlanParser.cs
new file mode 100644
index 00000000..6dfabd39
--- /dev/null
+++ b/Dashboard/Services/ShowPlanParser.cs
@@ -0,0 +1,1602 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml.Linq;
+using PerformanceMonitorDashboard.Models;
+
+namespace PerformanceMonitorDashboard.Services;
+
+public static class ShowPlanParser
+{
+    private static readonly XNamespace Ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
+
+    public static ParsedPlan Parse(string xml)
+    {
+        var plan = new ParsedPlan { RawXml = xml };
+
+        XDocument doc;
+        try
+        {
+            doc = XDocument.Parse(xml);
+        }
+        catch
+        {
+            return plan;
+        }
+
+        var root = doc.Root;
+        if (root == null) return plan;
+
+        plan.BuildVersion = root.Attribute("Version")?.Value;
+        plan.Build = root.Attribute("Build")?.Value;
+        plan.ClusteredMode = root.Attribute("ClusteredMode")?.Value is "true" or "1";
+
+        // Standard path: ShowPlanXML → BatchSequence → Batch → Statements
+        var batches = root.Descendants(Ns + "Batch");
+        foreach (var batchEl in batches)
+        {
+            var batch = new PlanBatch();
+            var statementsEl = batchEl.Element(Ns + "Statements");
+            if (statementsEl != null)
+            {
+                foreach (var stmtEl in statementsEl.Elements())
+                {
+                    var stmts = ParseStatementAndChildren(stmtEl);
+                    batch.Statements.AddRange(stmts);
+                }
+            }
+            if (batch.Statements.Count > 0)
+                plan.Batches.Add(batch);
+        }
+
+        // Fallback: some plan XML has StmtSimple directly under QueryPlan
+        if (plan.Batches.Count == 0)
+        {
+            var batch = new PlanBatch();
+            foreach (var stmtEl in root.Descendants(Ns + "StmtSimple"))
+            {
+                var stmt = ParseStatement(stmtEl);
+                if (stmt != null)
+                    batch.Statements.Add(stmt);
+            }
+            if (batch.Statements.Count > 0)
+                plan.Batches.Add(batch);
+        }
+
+        ComputeOperatorCosts(plan);
+        return plan;
+    }
+
+    /// <summary>
+    /// Handles StmtSimple, StmtCond (IF/ELSE), and StmtCursor recursively.
+    /// Returns a flat list of all parseable statements found.
+    /// </summary>
+    private static List<PlanStatement> ParseStatementAndChildren(XElement stmtEl)
+    {
+        var results = new List<PlanStatement>();
+        var localName = stmtEl.Name.LocalName;
+
+        if (localName == "StmtCond")
+        {
+            // IF/ELSE blocks — recurse into Condition, Then, Else
+            var condEl = stmtEl.Element(Ns + "Condition");
+            if (condEl != null)
+            {
+                foreach (var child in condEl.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+
+            var thenStmts = stmtEl.Element(Ns + "Then")?.Element(Ns + "Statements");
+            if (thenStmts != null)
+            {
+                foreach (var child in thenStmts.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+
+            var elseStmts = stmtEl.Element(Ns + "Else")?.Element(Ns + "Statements");
+            if (elseStmts != null)
+            {
+                foreach (var child in elseStmts.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+        }
+        else if (localName == "StmtCursor")
+        {
+            // Cursor plans — parse each Operation's QueryPlan
+            var cursorPlanEl = stmtEl.Element(Ns + "CursorPlan");
+            if (cursorPlanEl != null)
+            {
+                var cursorName = cursorPlanEl.Attribute("CursorName")?.Value;
+                var cursorActualType = cursorPlanEl.Attribute("CursorActualType")?.Value;
+                var cursorRequestedType = cursorPlanEl.Attribute("CursorRequestedType")?.Value;
+                var cursorConcurrency = cursorPlanEl.Attribute("CursorConcurrency")?.Value;
+                var cursorForwardOnly = cursorPlanEl.Attribute("ForwardOnly")?.Value is "true" or "1";
+
+                foreach (var opEl in cursorPlanEl.Elements(Ns + "Operation"))
+                {
+                    var opType = opEl.Attribute("OperationType")?.Value ?? "CursorOp";
+                    var qpEl = opEl.Element(Ns + "QueryPlan");
+                    if (qpEl == null) continue;
+
+                    // Build a synthetic StmtSimple-like wrapper for ParseStatement
+                    var relOpEl = qpEl.Element(Ns + "RelOp");
+                    if (relOpEl == null) continue;
+
+                    var stmt = ParseQueryPlanAsStatement(stmtEl, qpEl, relOpEl);
+                    if (stmt != null)
+                    {
+                        // Override statement text with cursor context
+                        if (string.IsNullOrEmpty(stmt.StatementText))
+                            stmt.StatementText = $"Cursor: {cursorName} ({opType})";
+                        stmt.CursorName = cursorName;
+                        stmt.CursorActualType = cursorActualType;
+                        stmt.CursorRequestedType = cursorRequestedType;
+                        stmt.CursorConcurrency = cursorConcurrency;
+                        stmt.CursorForwardOnly = cursorForwardOnly;
+                        results.Add(stmt);
+                    }
+                }
+            }
+        }
+        else
+        {
+            // StmtSimple or any other statement type
+            var stmt = ParseStatement(stmtEl);
+            if (stmt != null)
+                results.Add(stmt);
+        }
+
+        return results;
+    }
+
+    private static PlanStatement? ParseStatement(XElement stmtEl)
+    {
+        var stmt = new PlanStatement
+        {
+            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
+            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "",
+            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value),
+            StatementEstRows = ParseDouble(stmtEl.Attribute("StatementEstRows")?.Value)
+        };
+
+        var queryPlanEl = stmtEl.Element(Ns + "QueryPlan");
+
+        // XSD gap: Dispatcher/PSP (on StmtSimple, not inside QueryPlan)
+        var dispatcherEl = stmtEl.Element(Ns + "Dispatcher");
+        if (dispatcherEl != null)
+        {
+            stmt.Dispatcher = new DispatcherInfo();
+            foreach (var pspEl in dispatcherEl.Elements(Ns + "ParameterSensitivePredicate"))
+            {
+                var psp = new ParameterSensitivePredicateInfo
+                {
+                    LowBoundary = ParseDouble(pspEl.Attribute("LowBoundary")?.Value),
+                    HighBoundary = ParseDouble(pspEl.Attribute("HighBoundary")?.Value)
+                };
+                var predEl = pspEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                psp.PredicateText = predEl?.Attribute("ScalarString")?.Value;
+                foreach (var statEl in pspEl.Elements(Ns + "StatisticsInfo"))
+                {
+                    psp.Statistics.Add(new OptimizerStatsUsageItem
+                    {
+                        StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                        TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                        DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
+                        SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
+                        ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
+                        SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
+                        LastUpdate = statEl.Attribute("LastUpdate")?.Value
+                    });
+                }
+                stmt.Dispatcher.ParameterSensitivePredicates.Add(psp);
+            }
+            foreach (var oppEl in dispatcherEl.Elements(Ns + "OptionalParameterPredicate"))
+            {
+                var opp = new OptionalParameterPredicateInfo();
+                var oppPredEl = oppEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                opp.PredicateText = oppPredEl?.Attribute("ScalarString")?.Value;
+                stmt.Dispatcher.OptionalParameterPredicates.Add(opp);
+            }
+        }
+
+        if (queryPlanEl == null) return stmt;
+
+        ParseStmtAttributes(stmt, stmtEl);
+        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
+
+        // Root RelOp — wrap in a synthetic statement-type node (SELECT, INSERT, etc.)
+        var relOpEl = queryPlanEl.Element(Ns + "RelOp");
+        if (relOpEl != null)
+        {
+            var opNode = ParseRelOp(relOpEl);
+            var stmtType = stmt.StatementType.Length > 0
+                ? stmt.StatementType.ToUpperInvariant()
+                : "QUERY";
+
+            var stmtNode = new PlanNode
+            {
+                NodeId = -1,
+                PhysicalOp = stmtType,
+                LogicalOp = stmtType,
+                EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
+                EstimateRows = stmt.StatementEstRows,
+                IconName = stmtType switch
+                {
+                    "SELECT" => "result",
+                    "INSERT" => "insert",
+                    "UPDATE" => "update",
+                    "DELETE" => "delete",
+                    _ => "language_construct_catch_all"
+                }
+            };
+            opNode.Parent = stmtNode;
+            stmtNode.Children.Add(opNode);
+            stmt.RootNode = stmtNode;
+        }
+
+        // XSD gap: UDF sub-plans
+        foreach (var udfEl in stmtEl.Elements(Ns + "UDF"))
+        {
+            var udfInfo = new FunctionPlanInfo
+            {
+                ProcName = udfEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = udfEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var udfStmts = udfEl.Element(Ns + "Statements");
+            if (udfStmts != null)
+            {
+                foreach (var childStmt in udfStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt);
+                    udfInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.UdfPlans.Add(udfInfo);
+        }
+
+        // XSD gap: StoredProc sub-plan
+        var storedProcEl = stmtEl.Element(Ns + "StoredProc");
+        if (storedProcEl != null)
+        {
+            var spInfo = new FunctionPlanInfo
+            {
+                ProcName = storedProcEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = storedProcEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var spStmts = storedProcEl.Element(Ns + "Statements");
+            if (spStmts != null)
+            {
+                foreach (var childStmt in spStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt);
+                    spInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.StoredProcPlan = spInfo;
+        }
+
+        return stmt;
+    }
+
+    /// <summary>
+    /// Parse a QueryPlan element that comes from a cursor Operation (no parent StmtSimple attributes).
+    /// </summary>
+    private static PlanStatement? ParseQueryPlanAsStatement(XElement stmtEl, XElement queryPlanEl, XElement relOpEl)
+    {
+        var stmt = new PlanStatement
+        {
+            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
+            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "SELECT",
+            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value)
+        };
+
+        ParseStmtAttributes(stmt, stmtEl);
+        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
+
+        var opNode = ParseRelOp(relOpEl);
+        var stmtType = stmt.StatementType.Length > 0
+            ? stmt.StatementType.ToUpperInvariant()
+            : "QUERY";
+
+        // Use subtree cost from RelOp if statement cost is 0
+        if (stmt.StatementSubTreeCost <= 0)
+            stmt.StatementSubTreeCost = opNode.EstimatedTotalSubtreeCost;
+
+        var stmtNode = new PlanNode
+        {
+            NodeId = -1,
+            PhysicalOp = stmtType,
+            LogicalOp = stmtType,
+            EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
+            EstimateRows = stmt.StatementEstRows,
+            IconName = stmtType switch
+            {
+                "SELECT" => "result",
+                "INSERT" => "insert",
+                "UPDATE" => "update",
+                "DELETE" => "delete",
+                _ => "language_construct_catch_all"
+            }
+        };
+        opNode.Parent = stmtNode;
+        stmtNode.Children.Add(opNode);
+        stmt.RootNode = stmtNode;
+
+        return stmt;
+    }
+
+    /// <summary>
+    /// Parse attributes from StmtSimple element.
+    /// </summary>
+    private static void ParseStmtAttributes(PlanStatement stmt, XElement stmtEl)
+    {
+        stmt.StatementOptmLevel = stmtEl.Attribute("StatementOptmLevel")?.Value;
+        stmt.StatementOptmEarlyAbortReason = stmtEl.Attribute("StatementOptmEarlyAbortReason")?.Value;
+        stmt.StatementParameterizationType = (int)ParseDouble(stmtEl.Attribute("StatementParameterizationType")?.Value);
+        stmt.StatementSqlHandle = stmtEl.Attribute("StatementSqlHandle")?.Value;
+        stmt.DatabaseContextSettingsId = ParseLong(stmtEl.Attribute("DatabaseContextSettingsId")?.Value);
+        stmt.ParentObjectId = (int)ParseDouble(stmtEl.Attribute("ParentObjectId")?.Value);
+        stmt.SecurityPolicyApplied = stmtEl.Attribute("SecurityPolicyApplied")?.Value is "true" or "1";
+        stmt.BatchModeOnRowStoreUsed = stmtEl.Attribute("BatchModeOnRowStoreUsed")?.Value is "true" or "1";
+        stmt.QueryHash = stmtEl.Attribute("QueryHash")?.Value;
+        stmt.QueryPlanHash = stmtEl.Attribute("QueryPlanHash")?.Value;
+
+        // Bug fix 1.3: CE version is on StmtSimple per XSD
+        stmt.CardinalityEstimationModelVersion = (int)ParseDouble(stmtEl.Attribute("CardinalityEstimationModelVersion")?.Value);
+
+        // Wave 3.6: Query Store hint attributes
+        stmt.QueryStoreStatementHintId = (int)ParseDouble(stmtEl.Attribute("QueryStoreStatementHintId")?.Value);
+        stmt.QueryStoreStatementHintText = stmtEl.Attribute("QueryStoreStatementHintText")?.Value;
+        stmt.QueryStoreStatementHintSource = stmtEl.Attribute("QueryStoreStatementHintSource")?.Value;
+
+        // XSD gap: Statement-level identifiers and handles
+        stmt.StatementId = (int)ParseDouble(stmtEl.Attribute("StatementId")?.Value);
+        stmt.StatementCompId = (int)ParseDouble(stmtEl.Attribute("StatementCompId")?.Value);
+        stmt.TemplatePlanGuideDB = stmtEl.Attribute("TemplatePlanGuideDB")?.Value;
+        stmt.TemplatePlanGuideName = stmtEl.Attribute("TemplatePlanGuideName")?.Value;
+        stmt.ParameterizedPlanHandle = stmtEl.Attribute("ParameterizedPlanHandle")?.Value;
+        stmt.BatchSqlHandle = stmtEl.Attribute("BatchSqlHandle")?.Value;
+        stmt.ContainsLedgerTables = stmtEl.Attribute("ContainsLedgerTables")?.Value is "true" or "1";
+        stmt.QueryCompilationReplay = (int)ParseDouble(stmtEl.Attribute("QueryCompilationReplay")?.Value);
+    }
+
+    /// <summary>
+    /// Parse child elements of QueryPlan (memory grant, stats, parameters, etc.)
+    /// </summary>
+    private static void ParseQueryPlanElements(PlanStatement stmt, XElement stmtEl, XElement queryPlanEl)
+    {
+        // StatementSetOptions (child element of StmtSimple)
+        var setOptsEl = stmtEl.Element(Ns + "StatementSetOptions");
+        if (setOptsEl != null)
+        {
+            stmt.SetOptions = new SetOptionsInfo
+            {
+                AnsiNulls = setOptsEl.Attribute("ANSI_NULLS")?.Value is "true" or "1",
+                AnsiPadding = setOptsEl.Attribute("ANSI_PADDING")?.Value is "true" or "1",
+                AnsiWarnings = setOptsEl.Attribute("ANSI_WARNINGS")?.Value is "true" or "1",
+                ArithAbort = setOptsEl.Attribute("ARITHABORT")?.Value is "true" or "1",
+                ConcatNullYieldsNull = setOptsEl.Attribute("CONCAT_NULL_YIELDS_NULL")?.Value is "true" or "1",
+                NumericRoundAbort = setOptsEl.Attribute("NUMERIC_ROUNDABORT")?.Value is "true" or "1",
+                QuotedIdentifier = setOptsEl.Attribute("QUOTED_IDENTIFIER")?.Value is "true" or "1"
+            };
+        }
+
+        // Memory grant info
+        var memEl = queryPlanEl.Element(Ns + "MemoryGrantInfo");
+        if (memEl != null)
+        {
+            stmt.MemoryGrant = new MemoryGrantInfo
+            {
+                SerialRequiredMemoryKB = ParseLong(memEl.Attribute("SerialRequiredMemory")?.Value),
+                SerialDesiredMemoryKB = ParseLong(memEl.Attribute("SerialDesiredMemory")?.Value),
+                RequiredMemoryKB = ParseLong(memEl.Attribute("RequiredMemory")?.Value),
+                DesiredMemoryKB = ParseLong(memEl.Attribute("DesiredMemory")?.Value),
+                RequestedMemoryKB = ParseLong(memEl.Attribute("RequestedMemory")?.Value),
+                GrantedMemoryKB = ParseLong(memEl.Attribute("GrantedMemory")?.Value),
+                MaxUsedMemoryKB = ParseLong(memEl.Attribute("MaxUsedMemory")?.Value),
+                GrantWaitTimeMs = ParseLong(memEl.Attribute("GrantWaitTime")?.Value),
+                LastRequestedMemoryKB = ParseLong(memEl.Attribute("LastRequestedMemory")?.Value),
+                IsMemoryGrantFeedbackAdjusted = memEl.Attribute("IsMemoryGrantFeedbackAdjusted")?.Value
+            };
+        }
+
+        // Statement-level metadata from QueryPlan attributes
+        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.CompileTimeMs = ParseLong(queryPlanEl.Attribute("CompileTime")?.Value);
+        stmt.CompileMemoryKB = ParseLong(queryPlanEl.Attribute("CompileMemory")?.Value);
+        stmt.CompileCPUMs = ParseLong(queryPlanEl.Attribute("CompileCPU")?.Value);
+
+        // Fallback: some plans have CE version on QueryPlan instead of StmtSimple
+        if (stmt.CardinalityEstimationModelVersion == 0)
+            stmt.CardinalityEstimationModelVersion = (int)ParseDouble(queryPlanEl.Attribute("CardinalityEstimationModelVersion")?.Value);
+
+        // Wave 2.5: MaxQueryMemory
+        stmt.MaxQueryMemoryKB = ParseLong(queryPlanEl.Attribute("MaxQueryMemory")?.Value);
+
+        // Wave 3.1: EffectiveDOP + DOP feedback
+        stmt.EffectiveDOP = (int)ParseDouble(queryPlanEl.Attribute("EffectiveDegreeOfParallelism")?.Value);
+        stmt.DOPFeedbackAdjusted = queryPlanEl.Attribute("IsDOPFeedbackAdjusted")?.Value;
+
+        // Wave 3.4: Plan Guide attributes
+        stmt.PlanGuideDB = queryPlanEl.Attribute("PlanGuideDB")?.Value;
+        stmt.PlanGuideName = queryPlanEl.Attribute("PlanGuideName")?.Value;
+        stmt.UsePlan = queryPlanEl.Attribute("UsePlan")?.Value is "true" or "1";
+
+        // Wave 3.5: ParameterizedText
+        stmt.ParameterizedText = queryPlanEl.Element(Ns + "ParameterizedText")?.Value;
+
+        // XSD gap: QueryPlan-level attributes
+        stmt.ContainsInterleavedExecutionCandidates = queryPlanEl.Attribute("ContainsInterleavedExecutionCandidates")?.Value is "true" or "1";
+        stmt.ContainsInlineScalarTsqlUdfs = queryPlanEl.Attribute("ContainsInlineScalarTsqlUdfs")?.Value is "true" or "1";
+        stmt.QueryVariantID = (int)ParseDouble(queryPlanEl.Attribute("QueryVariantID")?.Value);
+        stmt.DispatcherPlanHandle = queryPlanEl.Attribute("DispatcherPlanHandle")?.Value;
+        stmt.ExclusiveProfileTimeActive = queryPlanEl.Attribute("ExclusiveProfileTimeActive")?.Value is "true" or "1";
+
+        // XSD gap: OptimizationReplay
+        var optReplayEl = queryPlanEl.Element(Ns + "OptimizationReplay");
+        if (optReplayEl != null)
+            stmt.OptimizationReplayScript = optReplayEl.Attribute("Script")?.Value;
+
+        // Missing indexes
+        stmt.MissingIndexes = ParseMissingIndexes(queryPlanEl);
+
+        // Wave 2.8: QueryPlan-level warnings
+        var planWarningsEl = queryPlanEl.Element(Ns + "Warnings");
+        if (planWarningsEl != null)
+            stmt.PlanWarnings = ParseWarningsFromElement(planWarningsEl);
+
+        // OptimizerHardwareDependentProperties
+        var hwEl = queryPlanEl.Element(Ns + "OptimizerHardwareDependentProperties");
+        if (hwEl != null)
+        {
+            stmt.HardwareProperties = new OptimizerHardwareInfo
+            {
+                EstimatedAvailableMemoryGrant = ParseLong(hwEl.Attribute("EstimatedAvailableMemoryGrant")?.Value),
+                EstimatedPagesCached = ParseLong(hwEl.Attribute("EstimatedPagesCached")?.Value),
+                EstimatedAvailableDOP = (int)ParseDouble(hwEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
+                MaxCompileMemory = ParseLong(hwEl.Attribute("MaxCompileMemory")?.Value)
+            };
+        }
+
+        // OptimizerStatsUsage
+        var statsUsageEl = queryPlanEl.Element(Ns + "OptimizerStatsUsage");
+        if (statsUsageEl != null)
+        {
+            foreach (var statEl in statsUsageEl.Elements(Ns + "StatisticsInfo"))
+            {
+                stmt.StatsUsage.Add(new OptimizerStatsUsageItem
+                {
+                    StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
+                    SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
+                    ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
+                    SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
+                    LastUpdate = statEl.Attribute("LastUpdate")?.Value
+                });
+            }
+        }
+
+        // ThreadStat (actual plans)
+        var threadStatEl = queryPlanEl.Element(Ns + "ThreadStat");
+        if (threadStatEl != null)
+        {
+            stmt.ThreadStats = new ThreadStatInfo
+            {
+                Branches = (int)ParseDouble(threadStatEl.Attribute("Branches")?.Value),
+                UsedThreads = (int)ParseDouble(threadStatEl.Attribute("UsedThreads")?.Value)
+            };
+            foreach (var trEl in threadStatEl.Elements(Ns + "ThreadReservation"))
+            {
+                stmt.ThreadStats.Reservations.Add(new ThreadReservation
+                {
+                    NodeId = (int)ParseDouble(trEl.Attribute("NodeId")?.Value),
+                    ReservedThreads = (int)ParseDouble(trEl.Attribute("ReservedThreads")?.Value)
+                });
+            }
+        }
+
+        // ParameterList
+        var paramListEl = queryPlanEl.Element(Ns + "ParameterList");
+        if (paramListEl != null)
+        {
+            foreach (var paramEl in paramListEl.Elements(Ns + "ColumnReference"))
+            {
+                stmt.Parameters.Add(new PlanParameter
+                {
+                    Name = paramEl.Attribute("Column")?.Value ?? "",
+                    DataType = paramEl.Attribute("ParameterDataType")?.Value ?? "",
+                    CompiledValue = paramEl.Attribute("ParameterCompiledValue")?.Value,
+                    RuntimeValue = paramEl.Attribute("ParameterRuntimeValue")?.Value
+                });
+            }
+        }
+
+        // WaitStats (actual plans)
+        var waitStatsEl = queryPlanEl.Element(Ns + "WaitStats");
+        if (waitStatsEl != null)
+        {
+            foreach (var waitEl in waitStatsEl.Elements(Ns + "Wait"))
+            {
+                stmt.WaitStats.Add(new WaitStatInfo
+                {
+                    WaitType = waitEl.Attribute("WaitType")?.Value ?? "",
+                    WaitTimeMs = ParseLong(waitEl.Attribute("WaitTimeMs")?.Value),
+                    WaitCount = ParseLong(waitEl.Attribute("WaitCount")?.Value)
+                });
+            }
+        }
+
+        // QueryTimeStats (actual plans)
+        var queryTimeEl = queryPlanEl.Element(Ns + "QueryTimeStats");
+        if (queryTimeEl != null)
+        {
+            stmt.QueryTimeStats = new QueryTimeInfo
+            {
+                CpuTimeMs = ParseLong(queryTimeEl.Attribute("CpuTime")?.Value),
+                ElapsedTimeMs = ParseLong(queryTimeEl.Attribute("ElapsedTime")?.Value)
+            };
+            stmt.QueryUdfCpuTimeMs = ParseLong(queryTimeEl.Attribute("UdfCpuTime")?.Value);
+            stmt.QueryUdfElapsedTimeMs = ParseLong(queryTimeEl.Attribute("UdfElapsedTime")?.Value);
+        }
+
+        // Wave 3.12: TraceFlags
+        foreach (var traceFlagsEl in queryPlanEl.Elements(Ns + "TraceFlags"))
+        {
+            var isCompile = traceFlagsEl.Attribute("IsCompileTime")?.Value is "true" or "1";
+            foreach (var tf in traceFlagsEl.Elements(Ns + "TraceFlag"))
+            {
+                stmt.TraceFlags.Add(new TraceFlagInfo
+                {
+                    Value = (int)ParseDouble(tf.Attribute("Value")?.Value),
+                    Scope = tf.Attribute("Scope")?.Value ?? "",
+                    IsCompileTime = isCompile
+                });
+            }
+        }
+
+        // Wave 3.13: IndexedViewInfo
+        var ivInfoEl = queryPlanEl.Element(Ns + "IndexedViewInfo");
+        if (ivInfoEl != null)
+        {
+            foreach (var objEl in ivInfoEl.Elements(Ns + "Object"))
+            {
+                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+                var parts = new List<string>();
+                if (!string.IsNullOrEmpty(db)) parts.Add(db);
+                if (!string.IsNullOrEmpty(schema)) parts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) parts.Add(table);
+                if (!string.IsNullOrEmpty(index)) parts.Add(index);
+                var name = string.Join(".", parts);
+                if (!string.IsNullOrEmpty(name))
+                    stmt.IndexedViews.Add(name);
+            }
+        }
+
+        // XSD gap: CardinalityFeedback
+        var ceFeedbackEl = queryPlanEl.Element(Ns + "CardinalityFeedback");
+        if (ceFeedbackEl != null)
+        {
+            foreach (var entry in ceFeedbackEl.Elements(Ns + "Entry"))
+            {
+                stmt.CardinalityFeedback.Add(new CardinalityFeedbackEntry
+                {
+                    Key = ParseLong(entry.Attribute("Key")?.Value),
+                    Value = ParseLong(entry.Attribute("Value")?.Value)
+                });
+            }
+        }
+    }
+
+    private static PlanNode ParseRelOp(XElement relOpEl)
+    {
+        var node = new PlanNode
+        {
+            NodeId = (int)ParseDouble(relOpEl.Attribute("NodeId")?.Value),
+            PhysicalOp = relOpEl.Attribute("PhysicalOp")?.Value ?? "",
+            LogicalOp = relOpEl.Attribute("LogicalOp")?.Value ?? "",
+            EstimatedTotalSubtreeCost = ParseDouble(relOpEl.Attribute("EstimatedTotalSubtreeCost")?.Value),
+            EstimateRows = ParseDouble(relOpEl.Attribute("EstimateRows")?.Value),
+            EstimateIO = ParseDouble(relOpEl.Attribute("EstimateIO")?.Value),
+            EstimateCPU = ParseDouble(relOpEl.Attribute("EstimateCPU")?.Value),
+            EstimateRebinds = ParseDouble(relOpEl.Attribute("EstimateRebinds")?.Value),
+            EstimateRewinds = ParseDouble(relOpEl.Attribute("EstimateRewinds")?.Value),
+            EstimatedRowSize = (int)ParseDouble(relOpEl.Attribute("AvgRowSize")?.Value),
+            Parallel = relOpEl.Attribute("Parallel")?.Value is "true" or "1",
+            Partitioned = relOpEl.Attribute("Partitioned")?.Value is "true" or "1",
+            ExecutionMode = relOpEl.Attribute("EstimatedExecutionMode")?.Value,
+            IsAdaptive = relOpEl.Attribute("IsAdaptive")?.Value is "true" or "1",
+            AdaptiveThresholdRows = ParseDouble(relOpEl.Attribute("AdaptiveThresholdRows")?.Value),
+            EstimatedJoinType = relOpEl.Attribute("EstimatedJoinType")?.Value,
+            // Wave 3.14: Estimated DOP per operator
+            EstimatedDOP = (int)ParseDouble(relOpEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
+            // XSD gap: RelOp-level metadata
+            GroupExecuted = relOpEl.Attribute("GroupExecuted")?.Value is "true" or "1",
+            RemoteDataAccess = relOpEl.Attribute("RemoteDataAccess")?.Value is "true" or "1",
+            OptimizedHalloweenProtectionUsed = relOpEl.Attribute("OptimizedHalloweenProtectionUsed")?.Value is "true" or "1",
+            StatsCollectionId = ParseLong(relOpEl.Attribute("StatsCollectionId")?.Value)
+        };
+
+        // Map to icon
+        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
+
+        // Handle operator-specific element
+        var physicalOpEl = GetOperatorElement(relOpEl);
+        if (physicalOpEl != null)
+        {
+            // Object reference (table/index name) — scoped to stop at child RelOps
+            var objEl = ScopedDescendants(physicalOpEl, Ns + "Object").FirstOrDefault();
+            if (objEl != null)
+            {
+                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+
+                node.DatabaseName = db;
+                node.IndexName = index;
+
+                var shortParts = new List<string>();
+                if (!string.IsNullOrEmpty(schema)) shortParts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) shortParts.Add(table);
+                node.ObjectName = shortParts.Count > 0 ? string.Join(".", shortParts) : null;
+
+                var fullParts = new List<string>();
+                if (!string.IsNullOrEmpty(db)) fullParts.Add(db);
+                if (!string.IsNullOrEmpty(schema)) fullParts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) fullParts.Add(table);
+                var fullName = string.Join(".", fullParts);
+                if (!string.IsNullOrEmpty(index))
+                    fullName += $".{index}";
+                node.FullObjectName = !string.IsNullOrEmpty(fullName) ? fullName : null;
+
+                node.StorageType = objEl.Attribute("Storage")?.Value;
+                node.ServerName = objEl.Attribute("Server")?.Value?.Replace("[", "").Replace("]", "");
+                node.ObjectAlias = objEl.Attribute("Alias")?.Value?.Replace("[", "").Replace("]", "");
+                node.IndexKind = objEl.Attribute("IndexKind")?.Value;
+                node.FilteredIndex = objEl.Attribute("Filtered")?.Value is "true" or "1";
+                node.TableReferenceId = (int)ParseDouble(objEl.Attribute("TableReferenceId")?.Value);
+            }
+
+            // Hash keys for hash match operators
+            var hashKeysProbeEl = physicalOpEl.Element(Ns + "HashKeysProbe");
+            if (hashKeysProbeEl != null)
+            {
+                var cols = hashKeysProbeEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                node.HashKeysProbe = string.Join(", ", cols);
+            }
+            var hashKeysBuildEl = physicalOpEl.Element(Ns + "HashKeysBuild");
+            if (hashKeysBuildEl != null)
+            {
+                var cols = hashKeysBuildEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                node.HashKeysBuild = string.Join(", ", cols);
+            }
+
+            // Ordered attribute
+            node.Ordered = physicalOpEl.Attribute("Ordered")?.Value == "true" || physicalOpEl.Attribute("Ordered")?.Value == "1";
+
+            // Seek predicates — scoped to stop at child RelOps
+            var seekPreds = ScopedDescendants(physicalOpEl, Ns + "SeekPredicateNew")
+                .Concat(ScopedDescendants(physicalOpEl, Ns + "SeekPredicate"));
+            var seekParts = new List<string>();
+            foreach (var sp in seekPreds)
+            {
+                var scalarOps = sp.Descendants(Ns + "ScalarOperator");
+                foreach (var so in scalarOps)
+                {
+                    var val = so.Attribute("ScalarString")?.Value;
+                    if (!string.IsNullOrEmpty(val))
+                        seekParts.Add(val);
+                }
+            }
+            if (seekParts.Count > 0)
+                node.SeekPredicates = string.Join(" AND ", seekParts);
+
+            // Residual predicate
+            var predEl = physicalOpEl.Elements(Ns + "Predicate").FirstOrDefault();
+            if (predEl != null)
+            {
+                var scalarOp = predEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.Predicate = scalarOp?.Attribute("ScalarString")?.Value;
+            }
+
+            // Partitioning type (for parallelism operators)
+            node.PartitioningType = physicalOpEl.Attribute("PartitioningType")?.Value;
+
+            // Build/Probe residuals (Hash Match)
+            var buildResEl = physicalOpEl.Element(Ns + "BuildResidual");
+            if (buildResEl != null)
+            {
+                var so = buildResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.BuildResidual = so?.Attribute("ScalarString")?.Value;
+            }
+            var probeResEl = physicalOpEl.Element(Ns + "ProbeResidual");
+            if (probeResEl != null)
+            {
+                var so = probeResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.ProbeResidual = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // Wave 2.1/2.2: Merge Residual + PassThru (Merge Join + Nested Loops)
+            var residualEl = physicalOpEl.Element(Ns + "Residual");
+            if (residualEl != null)
+            {
+                var so = residualEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.MergeResidual = so?.Attribute("ScalarString")?.Value;
+            }
+            var passThruEl = physicalOpEl.Element(Ns + "PassThru");
+            if (passThruEl != null)
+            {
+                var so = passThruEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.PassThru = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // OrderBy columns (Sort operator)
+            var orderByEl = physicalOpEl.Element(Ns + "OrderBy");
+            if (orderByEl != null)
+            {
+                var obParts = orderByEl.Elements(Ns + "OrderByColumn")
+                    .Select(obc =>
+                    {
+                        var ascending = obc.Attribute("Ascending")?.Value != "false";
+                        var colRef = obc.Element(Ns + "ColumnReference");
+                        var name = colRef != null ? FormatColumnRef(colRef) : "";
+                        return string.IsNullOrEmpty(name) ? "" : $"{name} {(ascending ? "ASC" : "DESC")}";
+                    })
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var obStr = string.Join(", ", obParts);
+                if (!string.IsNullOrEmpty(obStr))
+                    node.OrderBy = obStr;
+            }
+
+            // OuterReferences (Nested Loops)
+            var outerRefsEl = physicalOpEl.Element(Ns + "OuterReferences");
+            if (outerRefsEl != null)
+            {
+                var refs = outerRefsEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var refsStr = string.Join(", ", refs);
+                if (!string.IsNullOrEmpty(refsStr))
+                    node.OuterReferences = refsStr;
+            }
+
+            // Inner/Outer side join columns (Merge Join)
+            node.InnerSideJoinColumns = ParseColumnList(physicalOpEl, "InnerSideJoinColumns");
+            node.OuterSideJoinColumns = ParseColumnList(physicalOpEl, "OuterSideJoinColumns");
+
+            // GroupBy columns (Hash/Stream Aggregate)
+            node.GroupBy = ParseColumnList(physicalOpEl, "GroupBy");
+
+            // Partition columns (Parallelism)
+            node.PartitionColumns = ParseColumnList(physicalOpEl, "PartitionColumns");
+
+            // Wave 2.6: Parallelism HashKeys
+            node.HashKeys = ParseColumnList(physicalOpEl, "HashKeys");
+
+            // Segment column
+            var segColEl = physicalOpEl.Element(Ns + "SegmentColumn")?.Element(Ns + "ColumnReference");
+            if (segColEl != null)
+                node.SegmentColumn = FormatColumnRef(segColEl);
+
+            // Defined values (Compute Scalar)
+            var definedValsEl = physicalOpEl.Element(Ns + "DefinedValues");
+            if (definedValsEl != null)
+            {
+                var dvParts = new List<string>();
+                foreach (var dvEl in definedValsEl.Elements(Ns + "DefinedValue"))
+                {
+                    var colRef = dvEl.Element(Ns + "ColumnReference");
+                    var scalarOp = dvEl.Element(Ns + "ScalarOperator");
+                    var colName = colRef != null ? FormatColumnRef(colRef) : "";
+                    var expr = scalarOp?.Attribute("ScalarString")?.Value ?? "";
+                    if (!string.IsNullOrEmpty(colName) && !string.IsNullOrEmpty(expr))
+                        dvParts.Add($"{colName} = {expr}");
+                    else if (!string.IsNullOrEmpty(expr))
+                        dvParts.Add(expr);
+                    else if (!string.IsNullOrEmpty(colName))
+                        dvParts.Add(colName);
+                }
+                if (dvParts.Count > 0)
+                    node.DefinedValues = string.Join("; ", dvParts);
+            }
+
+            // IndexScan / TableScan properties
+            node.ScanDirection = physicalOpEl.Attribute("ScanDirection")?.Value;
+            node.ForcedIndex = physicalOpEl.Attribute("ForcedIndex")?.Value is "true" or "1";
+            node.ForceScan = physicalOpEl.Attribute("ForceScan")?.Value is "true" or "1";
+            node.ForceSeek = physicalOpEl.Attribute("ForceSeek")?.Value is "true" or "1";
+            node.NoExpandHint = physicalOpEl.Attribute("NoExpandHint")?.Value is "true" or "1";
+            node.Lookup = physicalOpEl.Attribute("Lookup")?.Value is "true" or "1";
+            node.DynamicSeek = physicalOpEl.Attribute("DynamicSeek")?.Value is "true" or "1";
+
+            // Table cardinality and rows to be read (on <RelOp> per XSD)
+            node.TableCardinality = ParseDouble(relOpEl.Attribute("TableCardinality")?.Value);
+            node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimatedRowsRead")?.Value);
+            if (node.EstimatedRowsRead == 0)
+                node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimateRowsWithoutRowGoal")?.Value);
+
+            // TOP operator properties
+            var topExprEl = physicalOpEl.Element(Ns + "TopExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+            if (topExprEl != null)
+                node.TopExpression = topExprEl.Attribute("ScalarString")?.Value;
+            node.IsPercent = physicalOpEl.Attribute("IsPercent")?.Value is "true" or "1";
+            node.WithTies = physicalOpEl.Attribute("WithTies")?.Value is "true" or "1";
+
+            // Wave 2.7: Top OffsetExpression, RowCount, Rows
+            var offsetEl = physicalOpEl.Element(Ns + "OffsetExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+            if (offsetEl != null)
+                node.OffsetExpression = offsetEl.Attribute("ScalarString")?.Value;
+            node.RowCount = physicalOpEl.Attribute("RowCount")?.Value is "true" or "1";
+            node.TopRows = (int)ParseDouble(physicalOpEl.Attribute("Rows")?.Value);
+
+            // Sort properties
+            node.SortDistinct = physicalOpEl.Attribute("Distinct")?.Value is "true" or "1";
+
+            // Filter properties
+            node.StartupExpression = physicalOpEl.Attribute("StartupExpression")?.Value is "true" or "1";
+
+            // Nested Loops properties
+            node.NLOptimized = physicalOpEl.Attribute("Optimized")?.Value is "true" or "1";
+            node.WithOrderedPrefetch = physicalOpEl.Attribute("WithOrderedPrefetch")?.Value is "true" or "1";
+            node.WithUnorderedPrefetch = physicalOpEl.Attribute("WithUnorderedPrefetch")?.Value is "true" or "1";
+
+            // Hash Match properties
+            node.ManyToMany = physicalOpEl.Attribute("ManyToMany")?.Value is "true" or "1";
+            node.BitmapCreator = physicalOpEl.Attribute("BitmapCreator")?.Value is "true" or "1";
+
+            // Parallelism properties
+            node.Remoting = physicalOpEl.Attribute("Remoting")?.Value is "true" or "1";
+            node.LocalParallelism = physicalOpEl.Attribute("LocalParallelism")?.Value is "true" or "1";
+
+            // Wave 3.8: Spool Stack + PrimaryNodeId
+            node.SpoolStack = physicalOpEl.Attribute("Stack")?.Value is "true" or "1";
+            node.PrimaryNodeId = (int)ParseDouble(physicalOpEl.Attribute("PrimaryNodeId")?.Value);
+
+            // Eager Index Spool — suggest CREATE INDEX from SeekPredicateNew + OutputList
+            if (node.LogicalOp == "Eager Spool")
+            {
+                var spoolSeek = physicalOpEl.Element(Ns + "SeekPredicateNew")
+                             ?? physicalOpEl.Element(Ns + "SeekPredicate");
+                if (spoolSeek != null)
+                {
+                    var rangeCols = spoolSeek.Descendants(Ns + "RangeColumns")
+                        .SelectMany(rc => rc.Elements(Ns + "ColumnReference"));
+
+                    var keyColumns = new List<string>();
+                    string? tblSchema = null;
+                    string? tblName = null;
+
+                    foreach (var col in rangeCols)
+                    {
+                        var colName = col.Attribute("Column")?.Value;
+                        if (!string.IsNullOrEmpty(colName))
+                            keyColumns.Add(colName);
+                        tblSchema ??= col.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                        tblName ??= col.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                    }
+
+                    if (keyColumns.Count > 0 && !string.IsNullOrEmpty(tblName))
+                    {
+                        var includeCols = relOpEl.Element(Ns + "OutputList")?.Elements(Ns + "ColumnReference")
+                            .Select(c => c.Attribute("Column")?.Value)
+                            .Where(c => !string.IsNullOrEmpty(c) && !keyColumns.Contains(c))
+                            .ToList() ?? new List<string?>();
+
+                        var prefix = !string.IsNullOrEmpty(tblSchema) ? $"{tblSchema}.{tblName}" : tblName;
+                        var keyStr = string.Join(", ", keyColumns);
+                        var sql = $"CREATE INDEX [{string.Join("_", keyColumns)}] ON {prefix} ({keyStr})";
+                        if (includeCols.Count > 0)
+                            sql += $" INCLUDE ({string.Join(", ", includeCols)})";
+                        sql += ";";
+                        node.SuggestedIndex = sql;
+                    }
+                }
+            }
+
+            // Wave 3.9: Update DMLRequestSort + ActionColumn
+            node.DMLRequestSort = physicalOpEl.Attribute("DMLRequestSort")?.Value is "true" or "1";
+            var actionColEl = physicalOpEl.Element(Ns + "ActionColumn")?.Element(Ns + "ColumnReference");
+            if (actionColEl != null)
+                node.ActionColumn = FormatColumnRef(actionColEl);
+
+            // SET predicate (UPDATE operator)
+            var setPredicateEl = physicalOpEl.Element(Ns + "SetPredicate");
+            if (setPredicateEl != null)
+            {
+                var so = setPredicateEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.SetPredicate = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // ActualJoinType from runtime info on adaptive joins
+            node.ActualJoinType = physicalOpEl.Attribute("ActualJoinType")?.Value;
+
+            // XSD gap: ForceSeekColumnCount (IndexScan)
+            node.ForceSeekColumnCount = (int)ParseDouble(physicalOpEl.Attribute("ForceSeekColumnCount")?.Value);
+
+            // XSD gap: PartitionId (IndexScan, TableScan, Sort, NestedLoops, AdaptiveJoin)
+            var partitionIdEl = physicalOpEl.Element(Ns + "PartitionId");
+            if (partitionIdEl != null)
+            {
+                var pidCols = partitionIdEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var pidStr = string.Join(", ", pidCols);
+                if (!string.IsNullOrEmpty(pidStr))
+                    node.PartitionId = pidStr;
+            }
+
+            // XSD gap: StarJoinInfo (Hash, Merge, NL, AdaptiveJoin)
+            var starJoinEl = physicalOpEl.Element(Ns + "StarJoinInfo");
+            if (starJoinEl != null)
+            {
+                node.IsStarJoin = starJoinEl.Attribute("Root")?.Value is "true" or "1";
+                node.StarJoinOperationType = starJoinEl.Attribute("OperationType")?.Value;
+            }
+
+            // XSD gap: ProbeColumn (NL, Parallelism, Update)
+            var probeColEl = physicalOpEl.Element(Ns + "ProbeColumn")?.Element(Ns + "ColumnReference");
+            if (probeColEl != null)
+                node.ProbeColumn = FormatColumnRef(probeColEl);
+
+            // XSD gap: InRow (Parallelism)
+            node.InRow = physicalOpEl.Attribute("InRow")?.Value is "true" or "1";
+
+            // XSD gap: ComputeSequence (ComputeScalar)
+            node.ComputeSequence = physicalOpEl.Attribute("ComputeSequence")?.Value is "true" or "1";
+
+            // XSD gap: RollupInfo (StreamAggregate)
+            var rollupEl = physicalOpEl.Element(Ns + "RollupInfo");
+            if (rollupEl != null)
+            {
+                node.RollupHighestLevel = (int)ParseDouble(rollupEl.Attribute("HighestLevel")?.Value);
+                foreach (var rlEl in rollupEl.Elements(Ns + "RollupLevel"))
+                    node.RollupLevels.Add((int)ParseDouble(rlEl.Attribute("Level")?.Value));
+            }
+
+            // XSD gap: TVF ParameterList
+            var tvfParamListEl = physicalOpEl.Element(Ns + "ParameterList");
+            if (tvfParamListEl != null)
+            {
+                var tvfCols = tvfParamListEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var tvfStr = string.Join(", ", tvfCols);
+                if (!string.IsNullOrEmpty(tvfStr))
+                    node.TvfParameters = tvfStr;
+                // Also check for ScalarOperator children (TVF can have scalar params)
+                if (string.IsNullOrEmpty(node.TvfParameters))
+                {
+                    var tvfScalars = tvfParamListEl.Elements(Ns + "ScalarOperator")
+                        .Select(s => s.Attribute("ScalarString")?.Value)
+                        .Where(s => !string.IsNullOrEmpty(s));
+                    var tvfScalarStr = string.Join(", ", tvfScalars);
+                    if (!string.IsNullOrEmpty(tvfScalarStr))
+                        node.TvfParameters = tvfScalarStr;
+                }
+            }
+
+            // XSD gap: OriginalActionColumn (Update)
+            var origActionColEl = physicalOpEl.Element(Ns + "OriginalActionColumn")?.Element(Ns + "ColumnReference");
+            if (origActionColEl != null)
+                node.OriginalActionColumn = FormatColumnRef(origActionColEl);
+
+            // XSD gap: Scalar UDF structured detection
+            foreach (var udfEl in ScopedDescendants(physicalOpEl, Ns + "UserDefinedFunction"))
+            {
+                var udfRef = new ScalarUdfReference
+                {
+                    FunctionName = udfEl.Attribute("FunctionName")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    IsClrFunction = udfEl.Attribute("IsClrFunction")?.Value is "true" or "1"
+                };
+                var clrEl = udfEl.Element(Ns + "CLRFunction");
+                if (clrEl != null)
+                {
+                    udfRef.ClrAssembly = clrEl.Attribute("Assembly")?.Value;
+                    udfRef.ClrClass = clrEl.Attribute("Class")?.Value;
+                    udfRef.ClrMethod = clrEl.Attribute("Method")?.Value;
+                }
+                if (!string.IsNullOrEmpty(udfRef.FunctionName))
+                    node.ScalarUdfs.Add(udfRef);
+            }
+
+            // XSD gap: TieColumns (Top operator)
+            node.TieColumns = ParseColumnList(physicalOpEl, "TieColumns");
+
+            // XSD gap: UDXName (Extension operator)
+            node.UdxName = physicalOpEl.Attribute("UDXName")?.Value;
+
+            // XSD gap: Operator-level IndexedViewInfo
+            var opIvInfoEl = physicalOpEl.Element(Ns + "IndexedViewInfo");
+            if (opIvInfoEl != null)
+            {
+                foreach (var ivObjEl in opIvInfoEl.Elements(Ns + "Object"))
+                {
+                    var ivDb = ivObjEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivSchema = ivObjEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivTable = ivObjEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivIndex = ivObjEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivParts = new List<string>();
+                    if (!string.IsNullOrEmpty(ivDb)) ivParts.Add(ivDb);
+                    if (!string.IsNullOrEmpty(ivSchema)) ivParts.Add(ivSchema);
+                    if (!string.IsNullOrEmpty(ivTable)) ivParts.Add(ivTable);
+                    if (!string.IsNullOrEmpty(ivIndex)) ivParts.Add(ivIndex);
+                    var ivName = string.Join(".", ivParts);
+                    if (!string.IsNullOrEmpty(ivName))
+                        node.OperatorIndexedViews.Add(ivName);
+                }
+            }
+
+            // XSD gap: NamedParameterList (IndexScan)
+            var namedParamListEl = physicalOpEl.Element(Ns + "NamedParameterList");
+            if (namedParamListEl != null)
+            {
+                foreach (var npEl in namedParamListEl.Elements(Ns + "NamedParameter"))
+                {
+                    var np = new NamedParameterInfo
+                    {
+                        Name = npEl.Attribute("Name")?.Value ?? ""
+                    };
+                    var npScalar = npEl.Element(Ns + "ScalarOperator");
+                    if (npScalar != null)
+                        np.ScalarString = npScalar.Attribute("ScalarString")?.Value;
+                    if (!string.IsNullOrEmpty(np.Name))
+                        node.NamedParameters.Add(np);
+                }
+            }
+
+            // XSD gap: Remote operator metadata
+            node.RemoteDestination = physicalOpEl.Attribute("RemoteDestination")?.Value;
+            node.RemoteSource = physicalOpEl.Attribute("RemoteSource")?.Value;
+            node.RemoteObject = physicalOpEl.Attribute("RemoteObject")?.Value;
+            node.RemoteQuery = physicalOpEl.Attribute("RemoteQuery")?.Value;
+        }
+
+        // Output columns
+        var outputList = relOpEl.Element(Ns + "OutputList");
+        if (outputList != null)
+        {
+            var cols = outputList.Elements(Ns + "ColumnReference")
+                .Select(c =>
+                {
+                    var col = c.Attribute("Column")?.Value ?? "";
+                    var tbl = c.Attribute("Table")?.Value ?? "";
+                    return string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
+                })
+                .Where(s => !string.IsNullOrEmpty(s));
+            var colList = string.Join(", ", cols);
+            if (!string.IsNullOrEmpty(colList))
+                node.OutputColumns = colList.Replace("[", "").Replace("]", "");
+        }
+
+        // Warnings
+        node.Warnings = ParseWarnings(relOpEl);
+
+        // Wave 3.2: MemoryFractions (on RelOp)
+        var memFracEl = relOpEl.Element(Ns + "MemoryFractions");
+        if (memFracEl != null)
+        {
+            node.MemoryFractionInput = ParseDouble(memFracEl.Attribute("Input")?.Value);
+            node.MemoryFractionOutput = ParseDouble(memFracEl.Attribute("Output")?.Value);
+        }
+
+        // Wave 3.3: RunTimePartitionSummary (on RelOp)
+        var rtPartEl = relOpEl.Element(Ns + "RunTimePartitionSummary");
+        if (rtPartEl != null)
+        {
+            var partAccEl = rtPartEl.Element(Ns + "PartitionsAccessed");
+            if (partAccEl != null)
+            {
+                node.PartitionsAccessed = (int)ParseDouble(partAccEl.Attribute("PartitionCount")?.Value);
+                var ranges = partAccEl.Elements(Ns + "PartitionRange")
+                    .Select(r => $"{r.Attribute("Start")?.Value}-{r.Attribute("End")?.Value}");
+                node.PartitionRanges = string.Join(", ", ranges);
+                if (string.IsNullOrEmpty(node.PartitionRanges))
+                    node.PartitionRanges = null;
+            }
+        }
+
+        // Wave 2.4: Per-operator memory grants (MemoryGrant on RelOp)
+        var memGrantEl = relOpEl.Element(Ns + "MemoryGrant");
+        if (memGrantEl != null)
+        {
+            node.MemoryGrantKB = ParseLong(memGrantEl.Attribute("GrantedMemory")?.Value);
+            node.DesiredMemoryKB = ParseLong(memGrantEl.Attribute("DesiredMemory")?.Value);
+            node.MaxUsedMemoryKB = ParseLong(memGrantEl.Attribute("MaxUsedMemory")?.Value);
+        }
+
+        // Runtime information (actual plan)
+        var runtimeEl = relOpEl.Element(Ns + "RunTimeInformation");
+        if (runtimeEl != null)
+        {
+            node.HasActualStats = true;
+            long totalRows = 0, totalExecutions = 0, totalRowsRead = 0;
+            long totalRebinds = 0, totalRewinds = 0;
+            long maxElapsed = 0, totalCpu = 0;
+            long totalLogicalReads = 0, totalPhysicalReads = 0;
+            long totalScans = 0, totalReadAheads = 0;
+            long totalLobLogicalReads = 0, totalLobPhysicalReads = 0, totalLobReadAheads = 0;
+            long totalSegmentReads = 0, totalSegmentSkips = 0;
+            long totalUdfCpu = 0, maxUdfElapsed = 0;
+            string? actualExecMode = null;
+
+            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
+            {
+                totalRows += ParseLong(thread.Attribute("ActualRows")?.Value);
+                totalExecutions += ParseLong(thread.Attribute("ActualExecutions")?.Value);
+                totalRowsRead += ParseLong(thread.Attribute("ActualRowsRead")?.Value);
+                totalRebinds += ParseLong(thread.Attribute("ActualRebinds")?.Value);
+                totalRewinds += ParseLong(thread.Attribute("ActualRewinds")?.Value);
+                totalCpu += ParseLong(thread.Attribute("ActualCPUms")?.Value);
+                totalLogicalReads += ParseLong(thread.Attribute("ActualLogicalReads")?.Value);
+                totalPhysicalReads += ParseLong(thread.Attribute("ActualPhysicalReads")?.Value);
+                totalScans += ParseLong(thread.Attribute("ActualScans")?.Value);
+                totalReadAheads += ParseLong(thread.Attribute("ActualReadAheads")?.Value);
+                totalLobLogicalReads += ParseLong(thread.Attribute("ActualLobLogicalReads")?.Value);
+                totalLobPhysicalReads += ParseLong(thread.Attribute("ActualLobPhysicalReads")?.Value);
+                totalLobReadAheads += ParseLong(thread.Attribute("ActualLobReadAheads")?.Value);
+
+                // Wave 3.10: Columnstore segment reads/skips
+                totalSegmentReads += ParseLong(thread.Attribute("ActualSegmentReads")?.Value);
+                totalSegmentSkips += ParseLong(thread.Attribute("ActualSegmentSkips")?.Value);
+
+                // Wave 3.11: UDF timing
+                totalUdfCpu += ParseLong(thread.Attribute("UdfCpuTime")?.Value);
+                var udfElapsed = ParseLong(thread.Attribute("UdfElapsedTime")?.Value);
+                if (udfElapsed > maxUdfElapsed) maxUdfElapsed = udfElapsed;
+
+                actualExecMode ??= thread.Attribute("ActualExecutionMode")?.Value;
+
+                var elapsed = ParseLong(thread.Attribute("ActualElapsedms")?.Value);
+                if (elapsed > maxElapsed) maxElapsed = elapsed;
+            }
+
+            node.ActualRows = totalRows;
+            node.ActualExecutions = totalExecutions;
+            node.ActualRowsRead = totalRowsRead;
+            node.ActualRebinds = totalRebinds;
+            node.ActualRewinds = totalRewinds;
+            node.ActualElapsedMs = maxElapsed;
+            node.ActualCPUMs = totalCpu;
+            node.ActualLogicalReads = totalLogicalReads;
+            node.ActualPhysicalReads = totalPhysicalReads;
+            node.ActualScans = totalScans;
+            node.ActualReadAheads = totalReadAheads;
+            node.ActualLobLogicalReads = totalLobLogicalReads;
+            node.ActualLobPhysicalReads = totalLobPhysicalReads;
+            node.ActualLobReadAheads = totalLobReadAheads;
+            node.ActualExecutionMode = actualExecMode;
+            node.ActualSegmentReads = totalSegmentReads;
+            node.ActualSegmentSkips = totalSegmentSkips;
+            node.UdfCpuTimeUs = totalUdfCpu;
+            node.UdfElapsedTimeUs = maxUdfElapsed;
+
+            // Store per-thread data for parallel skew analysis
+            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
+            {
+                node.PerThreadStats.Add(new PerThreadRuntimeInfo
+                {
+                    ThreadId = (int)ParseDouble(thread.Attribute("Thread")?.Value),
+                    ActualRows = ParseLong(thread.Attribute("ActualRows")?.Value),
+                    ActualExecutions = ParseLong(thread.Attribute("ActualExecutions")?.Value),
+                    ActualElapsedMs = ParseLong(thread.Attribute("ActualElapsedms")?.Value),
+                    ActualCPUMs = ParseLong(thread.Attribute("ActualCPUms")?.Value),
+                    ActualRowsRead = ParseLong(thread.Attribute("ActualRowsRead")?.Value),
+                    ActualLogicalReads = ParseLong(thread.Attribute("ActualLogicalReads")?.Value),
+                    ActualPhysicalReads = ParseLong(thread.Attribute("ActualPhysicalReads")?.Value),
+                    ActualScans = ParseLong(thread.Attribute("ActualScans")?.Value),
+                    ActualReadAheads = ParseLong(thread.Attribute("ActualReadAheads")?.Value),
+                    FirstActiveTime = ParseLong(thread.Attribute("FirstActiveTime")?.Value),
+                    LastActiveTime = ParseLong(thread.Attribute("LastActiveTime")?.Value),
+                    OpenTime = ParseLong(thread.Attribute("OpenTime")?.Value),
+                    FirstRowTime = ParseLong(thread.Attribute("FirstRowTime")?.Value),
+                    LastRowTime = ParseLong(thread.Attribute("LastRowTime")?.Value),
+                    CloseTime = ParseLong(thread.Attribute("CloseTime")?.Value),
+                    InputMemoryGrant = ParseLong(thread.Attribute("InputMemoryGrant")?.Value),
+                    OutputMemoryGrant = ParseLong(thread.Attribute("OutputMemoryGrant")?.Value),
+                    UsedMemoryGrant = ParseLong(thread.Attribute("UsedMemoryGrant")?.Value),
+                    Batches = ParseLong(thread.Attribute("Batches")?.Value),
+                    ActualEndOfScans = ParseLong(thread.Attribute("ActualEndOfScans")?.Value),
+                    ActualLocallyAggregatedRows = ParseLong(thread.Attribute("ActualLocallyAggregatedRows")?.Value),
+                    IsInterleavedExecuted = thread.Attribute("IsInterleavedExecuted")?.Value is "true" or "1",
+                    RowRequalifications = ParseLong(thread.Attribute("RowRequalifications")?.Value)
+                });
+            }
+        }
+
+        // Recurse into child RelOps
+        foreach (var childRelOp in FindChildRelOps(relOpEl))
+        {
+            var childNode = ParseRelOp(childRelOp);
+            childNode.Parent = node;
+            node.Children.Add(childNode);
+        }
+
+        return node;
+    }
+
+    private static XElement? GetOperatorElement(XElement relOpEl)
+    {
+        foreach (var child in relOpEl.Elements())
+        {
+            var name = child.Name.LocalName;
+            if (name != "OutputList" && name != "RunTimeInformation" && name != "Warnings"
+                && name != "MemoryFractions" && name != "RunTimePartitionSummary"
+                && name != "MemoryGrant" && name != "InternalInfo")
+            {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    private static IEnumerable<XElement> FindChildRelOps(XElement relOpEl)
+    {
+        var operatorEl = GetOperatorElement(relOpEl);
+        if (operatorEl == null) yield break;
+
+        foreach (var child in operatorEl.Elements(Ns + "RelOp"))
+            yield return child;
+
+        foreach (var child in operatorEl.Elements())
+        {
+            if (child.Name.LocalName == "RelOp") continue;
+            foreach (var nestedRelOp in child.Elements(Ns + "RelOp"))
+                yield return nestedRelOp;
+        }
+    }
+
+    private static List<MissingIndex> ParseMissingIndexes(XElement queryPlanEl)
+    {
+        var result = new List<MissingIndex>();
+        var missingIndexesEl = queryPlanEl.Element(Ns + "MissingIndexes");
+        if (missingIndexesEl == null) return result;
+
+        foreach (var groupEl in missingIndexesEl.Elements(Ns + "MissingIndexGroup"))
+        {
+            var impact = ParseDouble(groupEl.Attribute("Impact")?.Value);
+            foreach (var indexEl in groupEl.Elements(Ns + "MissingIndex"))
+            {
+                var mi = new MissingIndex
+                {
+                    Database = indexEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Schema = indexEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Table = indexEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Impact = impact
+                };
+
+                foreach (var colGroup in indexEl.Elements(Ns + "ColumnGroup"))
+                {
+                    var usage = colGroup.Attribute("Usage")?.Value ?? "";
+                    var cols = colGroup.Elements(Ns + "Column")
+                        .Select(c => c.Attribute("Name")?.Value?.Replace("[", "").Replace("]", "") ?? "")
+                        .Where(s => !string.IsNullOrEmpty(s))
+                        .ToList();
+
+                    switch (usage)
+                    {
+                        case "EQUALITY": mi.EqualityColumns = cols; break;
+                        case "INEQUALITY": mi.InequalityColumns = cols; break;
+                        case "INCLUDE": mi.IncludeColumns = cols; break;
+                    }
+                }
+
+                var keyCols = mi.EqualityColumns.Concat(mi.InequalityColumns).ToList();
+                if (keyCols.Count > 0)
+                {
+                    var create = $"CREATE NONCLUSTERED INDEX [IX_{mi.Table}_{string.Join("_", keyCols.Take(3))}]\nON {mi.Schema}.{mi.Table} ({string.Join(", ", keyCols)})";
+                    if (mi.IncludeColumns.Count > 0)
+                        create += $"\nINCLUDE ({string.Join(", ", mi.IncludeColumns)})";
+                    mi.CreateStatement = create;
+                }
+
+                result.Add(mi);
+            }
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Parse warnings from a parent element that contains a &lt;Warnings&gt; child (e.g. RelOp).
+    /// </summary>
+    private static List<PlanWarning> ParseWarnings(XElement parentEl)
+    {
+        var warningsEl = parentEl.Element(Ns + "Warnings");
+        if (warningsEl == null) return new List<PlanWarning>();
+        return ParseWarningsFromElement(warningsEl);
+    }
+
+    /// <summary>
+    /// Parse warnings directly from a &lt;Warnings&gt; element.
+    /// </summary>
+    private static List<PlanWarning> ParseWarningsFromElement(XElement warningsEl)
+    {
+        var result = new List<PlanWarning>();
+
+        // No join predicate
+        if (warningsEl.Attribute("NoJoinPredicate")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "No Join Predicate",
+                Message = "This join has no join predicate (possible cross join)",
+                Severity = PlanWarningSeverity.Critical
+            });
+        }
+
+        if (warningsEl.Attribute("SpatialGuess")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spatial Guess",
+                Message = "Spatial index selectivity was guessed",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        if (warningsEl.Attribute("UnmatchedIndexes")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Unmatched Indexes",
+                Message = "Indexes could not be matched due to parameterization",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        if (warningsEl.Attribute("FullUpdateForOnlineIndexBuild")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Full Update for Online Index Build",
+                Message = "Full update required for online index build operation",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        // Spill to TempDb (with enhanced details — Wave 3.7)
+        foreach (var spillEl in warningsEl.Elements(Ns + "SpillToTempDb"))
+        {
+            var spillLevel = spillEl.Attribute("SpillLevel")?.Value ?? "?";
+            var threadCount = spillEl.Attribute("SpilledThreadCount")?.Value ?? "?";
+            var msg = $"Spill level {spillLevel}, {threadCount} thread(s)";
+
+            var grantedKB = ParseLong(spillEl.Attribute("GrantedMemoryKB")?.Value);
+            var usedKB = ParseLong(spillEl.Attribute("UsedMemoryKB")?.Value);
+            var writes = ParseLong(spillEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(spillEl.Attribute("ReadsFromTempDb")?.Value);
+            if (grantedKB > 0 || writes > 0)
+            {
+                msg += $" — Granted: {grantedKB:N0} KB, Used: {usedKB:N0} KB";
+                if (writes > 0) msg += $", Writes: {writes:N0}";
+                if (reads > 0) msg += $", Reads: {reads:N0}";
+            }
+
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill to TempDb",
+                Message = msg,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Sort spill details
+        foreach (var sortSpillEl in warningsEl.Elements(Ns + "SortSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Sort Spill",
+                Message = $"Sort spill — Granted: {ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Sort",
+                    GrantedMemoryKB = ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value),
+                    UsedMemoryKB = ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value),
+                    WritesToTempDb = ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value),
+                    ReadsFromTempDb = ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value)
+                }
+            });
+        }
+
+        // Hash spill details
+        foreach (var hashSpillEl in warningsEl.Elements(Ns + "HashSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Hash Spill",
+                Message = $"Hash spill — Granted: {ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Hash",
+                    GrantedMemoryKB = ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value),
+                    UsedMemoryKB = ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value),
+                    WritesToTempDb = ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value),
+                    ReadsFromTempDb = ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value)
+                }
+            });
+        }
+
+        // Exchange spill details
+        foreach (var exchSpillEl in warningsEl.Elements(Ns + "ExchangeSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Exchange Spill",
+                Message = $"Exchange spill — Writes: {ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value):N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Exchange",
+                    WritesToTempDb = ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value)
+                }
+            });
+        }
+
+        // SpillOccurred
+        var spillOccurredEl = warningsEl.Element(Ns + "SpillOccurred");
+        if (spillOccurredEl != null)
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill Occurred",
+                Message = "Spill occurred during execution (from last query plan stats)",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Memory grant warning
+        var memWarnEl = warningsEl.Element(Ns + "MemoryGrantWarning");
+        if (memWarnEl != null)
+        {
+            var kind = memWarnEl.Attribute("GrantWarningKind")?.Value ?? "Unknown";
+            var requested = ParseLong(memWarnEl.Attribute("RequestedMemory")?.Value);
+            var granted = ParseLong(memWarnEl.Attribute("GrantedMemory")?.Value);
+            var maxUsed = ParseLong(memWarnEl.Attribute("MaxUsedMemory")?.Value);
+            result.Add(new PlanWarning
+            {
+                WarningType = "Memory Grant",
+                Message = $"{kind}: Requested {requested:N0} KB, Granted {granted:N0} KB, Used {maxUsed:N0} KB",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Implicit conversions
+        foreach (var convertEl in warningsEl.Elements(Ns + "PlanAffectingConvert"))
+        {
+            var issue = convertEl.Attribute("ConvertIssue")?.Value ?? "Unknown";
+            var expr = convertEl.Attribute("Expression")?.Value ?? "";
+            result.Add(new PlanWarning
+            {
+                WarningType = "Implicit Conversion",
+                Message = $"{issue}: {expr}",
+                Severity = issue.Contains("Cardinality") ? PlanWarningSeverity.Warning : PlanWarningSeverity.Critical
+            });
+        }
+
+        // Columns with no statistics
+        var noStatsEl = warningsEl.Element(Ns + "ColumnsWithNoStatistics");
+        if (noStatsEl != null)
+        {
+            var cols = noStatsEl.Elements(Ns + "ColumnReference")
+                .Select(c => c.Attribute("Column")?.Value ?? "")
+                .Where(s => !string.IsNullOrEmpty(s));
+            result.Add(new PlanWarning
+            {
+                WarningType = "Missing Statistics",
+                Message = $"No statistics on: {string.Join(", ", cols)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Wave 2.3: Columns with stale statistics
+        var staleStatsEl = warningsEl.Element(Ns + "ColumnsWithStaleStatistics");
+        if (staleStatsEl != null)
+        {
+            var cols = staleStatsEl.Elements(Ns + "ColumnReference")
+                .Select(c => c.Attribute("Column")?.Value ?? "")
+                .Where(s => !string.IsNullOrEmpty(s));
+            result.Add(new PlanWarning
+            {
+                WarningType = "Stale Statistics",
+                Message = $"Stale statistics on: {string.Join(", ", cols)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Wait warnings
+        foreach (var waitEl in warningsEl.Elements(Ns + "Wait"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Wait",
+                Message = $"{waitEl.Attribute("WaitType")?.Value}: {waitEl.Attribute("WaitTime")?.Value}ms",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        return result;
+    }
+
+    private static void ComputeOperatorCosts(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var stmt in batch.Statements)
+            {
+                if (stmt.RootNode == null) continue;
+                var totalCost = stmt.StatementSubTreeCost > 0
+                    ? stmt.StatementSubTreeCost
+                    : stmt.RootNode.EstimatedTotalSubtreeCost;
+                if (totalCost <= 0) totalCost = 1;
+                ComputeNodeCosts(stmt.RootNode, totalCost);
+            }
+        }
+    }
+
+    private static void ComputeNodeCosts(PlanNode node, double totalStatementCost)
+    {
+        var childrenSubtreeCost = node.Children.Sum(c => c.EstimatedTotalSubtreeCost);
+        node.EstimatedOperatorCost = Math.Max(0, node.EstimatedTotalSubtreeCost - childrenSubtreeCost);
+        node.CostPercent = (int)Math.Round((node.EstimatedOperatorCost / totalStatementCost) * 100);
+        node.CostPercent = Math.Min(100, Math.Max(0, node.CostPercent));
+
+        foreach (var child in node.Children)
+            ComputeNodeCosts(child, totalStatementCost);
+    }
+
+    private static IEnumerable<XElement> ScopedDescendants(XElement element, XName name)
+    {
+        foreach (var child in element.Elements())
+        {
+            if (child.Name == Ns + "RelOp") continue;
+            if (child.Name == name) yield return child;
+            foreach (var desc in ScopedDescendants(child, name))
+                yield return desc;
+        }
+    }
+
+    private static string? ParseColumnList(XElement parent, string elementName)
+    {
+        var el = parent.Element(Ns + elementName);
+        if (el == null) return null;
+        var cols = el.Elements(Ns + "ColumnReference")
+            .Select(c => FormatColumnRef(c))
+            .Where(s => !string.IsNullOrEmpty(s));
+        var result = string.Join(", ", cols);
+        return string.IsNullOrEmpty(result) ? null : result;
+    }
+
+    private static string FormatColumnRef(XElement colRef)
+    {
+        var col = colRef.Attribute("Column")?.Value ?? "";
+        var tbl = colRef.Attribute("Table")?.Value ?? "";
+        var result = string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
+        return result.Replace("[", "").Replace("]", "");
+    }
+
+    private static double ParseDouble(string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return 0;
+        return double.TryParse(value, System.Globalization.NumberStyles.Float,
+            System.Globalization.CultureInfo.InvariantCulture, out var result) ? result : 0;
+    }
+
+    private static long ParseLong(string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return 0;
+        return long.TryParse(value, out var result) ? result : 0;
+    }
+}
diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index c7f21f33..af293423 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -67,6 +67,20 @@
                             </ComboBox>
                         </StackPanel>
 
+                        <!-- CSV Export Section -->
+                        <TextBlock Text="CSV Export" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,20">
+                            <TextBlock Text="Separator:" VerticalAlignment="Center" Margin="0,0,10,0"/>
+                            <ComboBox x:Name="CsvSeparatorComboBox" Width="140">
+                                <ComboBoxItem Content="Comma (,)" Tag=","/>
+                                <ComboBoxItem Content="Semicolon (;)" Tag=";"/>
+                                <ComboBoxItem Content="Tab" Tag="&#x9;"/>
+                            </ComboBox>
+                            <TextBlock Text="auto-detected from locale" FontSize="11" FontStyle="Italic"
+                                       Foreground="Gray" VerticalAlignment="Center" Margin="8,0,0,0"
+                                       x:Name="CsvSeparatorHint"/>
+                        </StackPanel>
+
                         <!-- Navigation Section -->
                         <TextBlock Text="Navigation" FontWeight="Bold" FontSize="13" Margin="0,0,0,10"/>
                         <CheckBox x:Name="FocusServerTabCheckBox"
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index 56bad3e0..54f2e4e8 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -86,6 +86,21 @@ private void LoadSettings()
                 DefaultTimeRangeComboBox.SelectedIndex = 4; // 24 hours
             }
 
+            // CSV separator
+            foreach (ComboBoxItem item in CsvSeparatorComboBox.Items)
+            {
+                if (item.Tag != null && item.Tag.ToString() == prefs.CsvSeparator)
+                {
+                    CsvSeparatorComboBox.SelectedItem = item;
+                    break;
+                }
+            }
+
+            if (CsvSeparatorComboBox.SelectedItem == null)
+            {
+                CsvSeparatorComboBox.SelectedIndex = 0; // Comma
+            }
+
             // Navigation settings
             FocusServerTabCheckBox.IsChecked = prefs.FocusServerTabOnClick;
 
@@ -460,6 +475,13 @@ private void OkButton_Click(object sender, RoutedEventArgs e)
                 prefs.DefaultHoursBack = int.Parse(rangeItem.Tag.ToString()!, CultureInfo.InvariantCulture);
             }
 
+            // Save CSV separator
+            if (CsvSeparatorComboBox.SelectedItem is ComboBoxItem csvItem && csvItem.Tag != null)
+            {
+                prefs.CsvSeparator = csvItem.Tag.ToString()!;
+                TabHelpers.CsvSeparator = prefs.CsvSeparator;
+            }
+
             // Save navigation settings
             prefs.FocusServerTabOnClick = FocusServerTabCheckBox.IsChecked == true;
 
diff --git a/Dashboard/Themes/DarkTheme.xaml b/Dashboard/Themes/DarkTheme.xaml
index d5fbb78a..0311a25e 100644
--- a/Dashboard/Themes/DarkTheme.xaml
+++ b/Dashboard/Themes/DarkTheme.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorDashboard.Helpers">
 
     <!-- ============================================ -->
     <!-- Darling Data Dark Theme                      -->
@@ -609,6 +610,7 @@
     <!-- DataGrid Style                               -->
     <!-- ============================================ -->
     <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
         <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
         <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
@@ -621,6 +623,22 @@
         <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
         <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
         <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <!-- Column header resize gripper -->
+    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <Style TargetType="DataGridColumnHeader">
@@ -631,17 +649,71 @@
         <Setter Property="Padding" Value="8,6"/>
         <Setter Property="FontWeight" Value="SemiBold"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="8" Height="6"
+                                      Margin="4,0,2,0"
+                                      Stretch="Fill"
+                                      Opacity="0.7"
+                                      Fill="{StaticResource ForegroundDimBrush}"
+                                      RenderTransformOrigin="0.5,0.5"
+                                      Visibility="Collapsed"
+                                      Data="M 0,0 L 8,0 L 4,6 Z"/>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <!-- Column header style when filter is active - subtle blue highlight -->
-    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader">
+    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader"
+           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
         <Setter Property="Background" Value="#3D5A80"/>
-        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="0,0,1,1"/>
-        <Setter Property="Padding" Value="8,6"/>
-        <Setter Property="FontWeight" Value="SemiBold"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+    </Style>
+
+    <!-- Right-aligned text style for numeric DataGrid columns -->
+    <Style x:Key="NumericCell" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="TextAlignment" Value="Right"/>
     </Style>
 
     <Style TargetType="DataGridCell">
@@ -1142,6 +1214,10 @@
         <Setter Property="BorderBrush" Value="{StaticResource BorderLightBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Padding" Value="10,8"/>
+        <Setter Property="MaxWidth" Value="600"/>
     </Style>
 
+    <!-- Apply DarkToolTip as the default for all tooltips -->
+    <Style TargetType="ToolTip" BasedOn="{StaticResource DarkToolTip}"/>
+
 </ResourceDictionary>
diff --git a/Dashboard/TracePatternHistoryWindow.xaml b/Dashboard/TracePatternHistoryWindow.xaml
new file mode 100644
index 00000000..70aaa90d
--- /dev/null
+++ b/Dashboard/TracePatternHistoryWindow.xaml
@@ -0,0 +1,217 @@
+<Window x:Class="PerformanceMonitorDashboard.TracePatternHistoryWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
+        Title="Trace Pattern History" Height="900" Width="1600"
+        WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource BackgroundBrush}">
+    <Window.Resources>
+        <!-- Context Menu for DataGrid Copy/Export -->
+        <ContextMenu x:Key="DataGridContextMenu">
+            <MenuItem Header="Copy Cell" Click="CopyCell_Click">
+                <MenuItem.Icon><TextBlock Text="&#x1F4CB;"/></MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Copy Row" Click="CopyRow_Click">
+                <MenuItem.Icon><TextBlock Text="&#x1F4C4;"/></MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click">
+                <MenuItem.Icon><TextBlock Text="&#x1F4D1;"/></MenuItem.Icon>
+            </MenuItem>
+            <Separator/>
+            <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click">
+                <MenuItem.Icon><TextBlock Text="&#x1F4CA;"/></MenuItem.Icon>
+            </MenuItem>
+        </ContextMenu>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="3*" MinHeight="300"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header -->
+        <Border Grid.Row="0" Background="{DynamicResource BackgroundLightBrush}" Padding="10" Margin="10,10,10,0">
+            <StackPanel>
+                <TextBlock x:Name="QueryIdentifierText" FontSize="16" FontWeight="Bold" Foreground="{DynamicResource ForegroundBrush}" TextWrapping="Wrap"/>
+                <TextBlock x:Name="SummaryText" Margin="0,5,0,0" Foreground="{DynamicResource ForegroundBrush}"/>
+            </StackPanel>
+        </Border>
+
+        <!-- Chart Area -->
+        <Border Grid.Row="1" Background="{DynamicResource BackgroundLightBrush}" Margin="10,10,10,0" Padding="10">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <!-- Chart Controls -->
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,10">
+                    <TextBlock Text="Metric:" VerticalAlignment="Center" Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,8,0"/>
+                    <ComboBox x:Name="MetricSelector" Width="200" SelectionChanged="MetricSelector_SelectionChanged">
+                        <ComboBoxItem Content="Duration (ms)" Tag="DurationMs" IsSelected="True"/>
+                        <ComboBoxItem Content="CPU (ms)" Tag="CpuMs"/>
+                        <ComboBoxItem Content="Reads (pages)" Tag="Reads"/>
+                        <ComboBoxItem Content="Writes (pages)" Tag="Writes"/>
+                        <ComboBoxItem Content="Row Counts" Tag="RowCounts"/>
+                    </ComboBox>
+                </StackPanel>
+
+                <!-- Chart -->
+                <ScottPlot:WpfPlot x:Name="HistoryChart" Grid.Row="1"/>
+            </Grid>
+        </Border>
+
+        <!-- Data Grid -->
+        <DataGrid Grid.Row="2" x:Name="HistoryDataGrid"
+                  AutoGenerateColumns="False"
+                  IsReadOnly="True"
+                  CanUserSortColumns="True"
+                  AlternatingRowBackground="{DynamicResource BackgroundLightBrush}"
+                  Background="{DynamicResource BackgroundBrush}"
+                  Foreground="{DynamicResource ForegroundBrush}"
+                  RowBackground="{DynamicResource BackgroundBrush}"
+                  GridLinesVisibility="All"
+                  ContextMenu="{DynamicResource DataGridContextMenu}"
+                  Margin="10">
+            <DataGrid.Columns>
+                <DataGridTextColumn Binding="{Binding EndTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EndTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="End Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding EventName}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventName" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Event" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding DurationMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding CpuMs, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CpuMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding Reads, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Reads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Reads (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding Writes, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Writes" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Writes (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding RowCounts, StringFormat='{}{0:N0}'}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RowCounts" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Row Counts" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding LoginName}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LoginName" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Login" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding ApplicationName}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ApplicationName" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Application" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding HostName}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HostName" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Host" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding Spid}" ElementStyle="{StaticResource NumericCell}" Width="60">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Spid" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="SPID" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding StartTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="StartTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Start Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding ObjectId}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ObjectId" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Object ID" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTemplateColumn Width="*" MinWidth="300">
+                    <DataGridTemplateColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SqlText" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="SQL Text" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTemplateColumn.Header>
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding SqlText}" TextWrapping="Wrap" MaxHeight="90" Margin="5,2" ToolTip="{Binding SqlText}"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- Footer -->
+        <Border Grid.Row="3" Background="{DynamicResource BackgroundLightBrush}" Padding="10" Margin="10,0,10,10">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Content="Close" Width="100" Height="30" Click="Close_Click"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
diff --git a/Dashboard/TracePatternHistoryWindow.xaml.cs b/Dashboard/TracePatternHistoryWindow.xaml.cs
new file mode 100644
index 00000000..94cbef97
--- /dev/null
+++ b/Dashboard/TracePatternHistoryWindow.xaml.cs
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using Microsoft.Win32;
+using PerformanceMonitorDashboard.Helpers;
+using PerformanceMonitorDashboard.Models;
+using PerformanceMonitorDashboard.Services;
+using ScottPlot;
+
+namespace PerformanceMonitorDashboard
+{
+    public partial class TracePatternHistoryWindow : Window
+    {
+        private readonly DatabaseService _databaseService;
+        private readonly string _databaseName;
+        private readonly string _queryPattern;
+        private readonly int _hoursBack;
+        private readonly DateTime? _fromDate;
+        private readonly DateTime? _toDate;
+        private List<TracePatternDetailItem> _historyData = new();
+        private ChartHoverHelper? _chartHover;
+
+        // Filter state
+        private Dictionary<string, ColumnFilterState> _filters = new();
+        private List<TracePatternDetailItem>? _unfilteredData;
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+
+        public TracePatternHistoryWindow(
+            DatabaseService databaseService,
+            string databaseName,
+            string queryPattern,
+            int hoursBack = 24,
+            DateTime? fromDate = null,
+            DateTime? toDate = null)
+        {
+            InitializeComponent();
+
+            _databaseService = databaseService;
+            _databaseName = databaseName;
+            _queryPattern = queryPattern;
+            _hoursBack = hoursBack;
+            _fromDate = fromDate;
+            _toDate = toDate;
+
+            // Collapse newlines/tabs to spaces and truncate for a clean single-line header
+            var displayPattern = System.Text.RegularExpressions.Regex.Replace(queryPattern, @"\s+", " ").Trim();
+            if (displayPattern.Length > 120)
+                displayPattern = displayPattern.Substring(0, 120) + "...";
+            QueryIdentifierText.Text = $"Trace Pattern History: [{databaseName}] — {displayPattern}";
+
+            ApplyDarkModeToChart();
+            Loaded += TracePatternHistoryWindow_Loaded;
+        }
+
+        private void ApplyDarkModeToChart()
+        {
+            Helpers.TabHelpers.ApplyDarkModeToChart(HistoryChart);
+        }
+
+        private async void TracePatternHistoryWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await LoadHistoryAsync();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(
+                    $"Failed to load trace pattern history:\n\n{ex.Message}",
+                    "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error
+                );
+            }
+        }
+
+        private async Task LoadHistoryAsync()
+        {
+            try
+            {
+                _historyData = await _databaseService.GetTracePatternHistoryAsync(_databaseName, _queryPattern, _hoursBack, _fromDate, _toDate);
+
+                _unfilteredData = _historyData;
+                _filters.Clear();
+                HistoryDataGrid.ItemsSource = _historyData;
+                UpdateFilterButtonStyles();
+
+                if (_historyData.Count > 0)
+                {
+                    var avgDuration = _historyData.Where(h => h.DurationMs.HasValue).Select(h => (double)(h.DurationMs ?? 0)).DefaultIfEmpty(0).Average();
+                    var avgCpu = _historyData.Where(h => h.CpuMs.HasValue).Select(h => (double)(h.CpuMs ?? 0)).DefaultIfEmpty(0).Average();
+                    var firstSample = _historyData.Where(h => h.EndTime.HasValue).Min(h => h.EndTime);
+                    var lastSample = _historyData.Where(h => h.EndTime.HasValue).Max(h => h.EndTime);
+
+                    SummaryText.Text = string.Format(CultureInfo.CurrentCulture,
+                        "Executions: {0} | First: {1:yyyy-MM-dd HH:mm} | Last: {2:yyyy-MM-dd HH:mm} | Avg Duration: {3:N0} ms | Avg CPU: {4:N0} ms",
+                        _historyData.Count, firstSample, lastSample, avgDuration, avgCpu);
+
+                    UpdateChart();
+                }
+                else
+                {
+                    SummaryText.Text = "No historical data found for this pattern.";
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(
+                    $"Failed to load trace pattern history:\n\n{ex.Message}",
+                    "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error
+                );
+            }
+        }
+
+        private void MetricSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_historyData.Count > 0)
+            {
+                UpdateChart();
+            }
+        }
+
+        private void UpdateChart()
+        {
+            if (_historyData == null || _historyData.Count == 0)
+                return;
+
+            HistoryChart.Plot.Clear();
+
+            var selectedItem = MetricSelector.SelectedItem as ComboBoxItem;
+            var metricTag = selectedItem?.Tag?.ToString() ?? "DurationMs";
+            var metricLabel = selectedItem?.Content?.ToString() ?? "Duration (ms)";
+
+            var orderedData = _historyData
+                .Where(h => h.EndTime.HasValue)
+                .OrderBy(h => h.EndTime)
+                .ToList();
+
+            if (orderedData.Count == 0) return;
+
+            var dates = orderedData.Select(h => h.EndTime!.Value.ToOADate()).ToArray();
+            var values = orderedData.Select(h => GetMetricValue(h, metricTag)).ToArray();
+
+            var color = ScottPlot.Color.FromHex("#4FC3F7");
+            var scatter = HistoryChart.Plot.Add.Scatter(dates, values);
+            scatter.Color = color;
+
+            // Sparse data: show only markers to avoid misleading interpolated lines
+            if (dates.Length <= 1)
+            {
+                scatter.LineWidth = 0;
+                scatter.MarkerSize = 8;
+            }
+            else
+            {
+                scatter.LineWidth = 2;
+                scatter.MarkerSize = 4;
+            }
+
+            HistoryChart.Plot.Axes.DateTimeTicksBottom();
+            Helpers.TabHelpers.ReapplyAxisColors(HistoryChart);
+            HistoryChart.Plot.YLabel(metricLabel);
+            HistoryChart.Plot.XLabel("End Time");
+
+            // Hover tooltip
+            var unit = metricTag.Contains("Ms") ? "ms" : "";
+            if (_chartHover == null)
+                _chartHover = new ChartHoverHelper(HistoryChart, unit);
+            else
+                _chartHover.Unit = unit;
+            _chartHover.Clear();
+            _chartHover.Add(scatter, metricLabel);
+
+            HistoryChart.Refresh();
+        }
+
+        private static double GetMetricValue(TracePatternDetailItem item, string metricTag)
+        {
+            return metricTag switch
+            {
+                "DurationMs" => (double)(item.DurationMs ?? 0),
+                "CpuMs" => (double)(item.CpuMs ?? 0),
+                "Reads" => (double)(item.Reads ?? 0),
+                "Writes" => (double)(item.Writes ?? 0),
+                "RowCounts" => (double)(item.RowCounts ?? 0),
+                _ => (double)(item.DurationMs ?? 0)
+            };
+        }
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        #region Column Filter Popup
+
+        private void Filter_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Button button || button.Tag is not string columnName) return;
+
+            if (_filterPopup == null)
+            {
+                _filterPopupContent = new ColumnFilterPopup();
+                _filterPopupContent.FilterApplied += FilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared += FilterPopup_FilterCleared;
+
+                _filterPopup = new Popup
+                {
+                    Child = _filterPopupContent,
+                    StaysOpen = false,
+                    Placement = PlacementMode.Bottom,
+                    AllowsTransparency = true
+                };
+            }
+
+            _filters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+
+            _filterPopup.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null) _filterPopup.IsOpen = false;
+
+            if (e.FilterState.IsActive)
+                _filters[e.FilterState.ColumnName] = e.FilterState;
+            else
+                _filters.Remove(e.FilterState.ColumnName);
+
+            ApplyFilters();
+            UpdateFilterButtonStyles();
+        }
+
+        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null) _filterPopup.IsOpen = false;
+        }
+
+        private void ApplyFilters()
+        {
+            if (_unfilteredData == null) return;
+
+            if (_filters.Count == 0)
+            {
+                HistoryDataGrid.ItemsSource = _unfilteredData;
+                return;
+            }
+
+            var filtered = _unfilteredData.Where(item =>
+            {
+                foreach (var filter in _filters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+                return true;
+            }).ToList();
+
+            HistoryDataGrid.ItemsSource = filtered;
+        }
+
+        private void UpdateFilterButtonStyles()
+        {
+            foreach (var column in HistoryDataGrid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
+                {
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton?.Tag is string columnName)
+                    {
+                        bool hasActive = _filters.TryGetValue(columnName, out var filter) && filter.IsActive;
+                        filterButton.Content = new System.Windows.Controls.TextBlock
+                        {
+                            Text = "\uE71C",
+                            FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                            Foreground = hasActive
+                                ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xD7, 0x00))
+                                : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xFF, 0xFF))
+                        };
+                        filterButton.ToolTip = hasActive && filter != null
+                            ? $"Filter: {filter.DisplayText}\n(Click to modify)"
+                            : "Click to filter";
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Context Menu Handlers
+
+        private void CopyCell_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.CurrentCell.Item != null)
+                {
+                    var cellContent = TabHelpers.GetCellContent(dataGrid, dataGrid.CurrentCell);
+                    if (!string.IsNullOrEmpty(cellContent))
+                        Clipboard.SetDataObject(cellContent, false);
+                }
+            }
+        }
+
+        private void CopyRow_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid?.SelectedItem != null)
+                    Clipboard.SetDataObject(TabHelpers.GetRowAsText(dataGrid, dataGrid.SelectedItem), false);
+            }
+        }
+
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var sb = new StringBuilder();
+                    var headers = new List<string>();
+                    foreach (var column in dataGrid.Columns)
+                    {
+                        if (column is DataGridBoundColumn)
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
+                    }
+                    sb.AppendLine(string.Join("\t", headers));
+                    foreach (var item in dataGrid.Items)
+                        sb.AppendLine(TabHelpers.GetRowAsText(dataGrid, item));
+                    Clipboard.SetDataObject(sb.ToString(), false);
+                }
+            }
+        }
+
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.Parent is ContextMenu contextMenu)
+            {
+                var dataGrid = TabHelpers.FindDataGridFromContextMenu(contextMenu);
+                if (dataGrid != null && dataGrid.Items.Count > 0)
+                {
+                    var saveFileDialog = new SaveFileDialog
+                    {
+                        FileName = $"trace_pattern_history_{DateTime.Now:yyyyMMdd_HHmmss}.csv",
+                        DefaultExt = ".csv",
+                        Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*"
+                    };
+
+                    if (saveFileDialog.ShowDialog() == true)
+                    {
+                        try
+                        {
+                            var sb = new StringBuilder();
+                            var headers = new List<string>();
+                            foreach (var column in dataGrid.Columns)
+                            {
+                                if (column is DataGridBoundColumn)
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
+                            }
+                            sb.AppendLine(string.Join(",", headers));
+                            foreach (var item in dataGrid.Items)
+                            {
+                                var values = TabHelpers.GetRowValues(dataGrid, item);
+                                sb.AppendLine(string.Join(",", values.Select(v => TabHelpers.EscapeCsvField(v))));
+                            }
+                            File.WriteAllText(saveFileDialog.FileName, sb.ToString());
+                            MessageBox.Show($"Data exported successfully to:\n{saveFileDialog.FileName}", "Export Complete", MessageBoxButton.OK, MessageBoxImage.Information);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show($"Error exporting data:\n\n{ex.Message}", "Export Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Dashboard/schema/tables.json b/Dashboard/schema/tables.json
index bbd88287..af9d0dbd 100644
--- a/Dashboard/schema/tables.json
+++ b/Dashboard/schema/tables.json
@@ -677,26 +677,5 @@
       "row_count": { "type": "bigint", "nullable": true }
     },
     "primary_key": ["collection_id"]
-  },
-  "collect.session_wait_stats": {
-    "description": "Per-session wait statistics from sys.dm_exec_session_wait_stats (SQL 2016 SP1+)",
-    "columns": {
-      "collection_id": { "type": "bigint", "nullable": false, "identity": true },
-      "collection_time": { "type": "datetime2(7)", "nullable": false },
-      "session_id": { "type": "integer", "nullable": false },
-      "wait_type": { "type": "nvarchar(60)", "nullable": false },
-      "waiting_tasks_count": { "type": "bigint", "nullable": false },
-      "wait_time_ms": { "type": "bigint", "nullable": false },
-      "max_wait_time_ms": { "type": "bigint", "nullable": false },
-      "signal_wait_time_ms": { "type": "bigint", "nullable": false },
-      "database_id": { "type": "integer", "nullable": true },
-      "database_name": { "type": "sysname", "nullable": true },
-      "login_name": { "type": "nvarchar(128)", "nullable": true },
-      "host_name": { "type": "nvarchar(128)", "nullable": true },
-      "program_name": { "type": "nvarchar(128)", "nullable": true },
-      "sql_handle": { "type": "varbinary(64)", "nullable": true },
-      "query_text": { "type": "nvarchar(max)", "nullable": true }
-    },
-    "primary_key": ["collection_id"]
   }
 }
diff --git a/Installer/PerformanceMonitorInstaller.csproj b/Installer/PerformanceMonitorInstaller.csproj
index a5091055..f245a1b5 100644
--- a/Installer/PerformanceMonitorInstaller.csproj
+++ b/Installer/PerformanceMonitorInstaller.csproj
@@ -20,10 +20,10 @@
     <!-- Application metadata -->
     <AssemblyName>PerformanceMonitorInstaller</AssemblyName>
     <Product>SQL Server Performance Monitor Installer</Product>
-    <Version>1.3.0</Version>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
-    <InformationalVersion>1.3.0</InformationalVersion>
+    <Version>2.0.0</Version>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
+    <FileVersion>2.0.0.0</FileVersion>
+    <InformationalVersion>2.0.0</InformationalVersion>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <Description>Installation utility for SQL Server Performance Monitor - Supports SQL Server 2016-2025</Description>
diff --git a/Installer/Program.cs b/Installer/Program.cs
index 6689f45b..a47ed83c 100644
--- a/Installer/Program.cs
+++ b/Installer/Program.cs
@@ -82,6 +82,36 @@ static async Task<int> Main(string[] args)
               --encrypt=X       Connection encryption: mandatory (default), optional, strict
               --trust-cert      Trust server certificate without validation (default: require valid cert)
             */
+            if (args.Any(a => a.Equals("--help", StringComparison.OrdinalIgnoreCase)
+                              || a.Equals("-h", StringComparison.OrdinalIgnoreCase)))
+            {
+                Console.WriteLine("Usage:");
+                Console.WriteLine("  PerformanceMonitorInstaller.exe                                   Interactive mode");
+                Console.WriteLine("  PerformanceMonitorInstaller.exe <server> [options]                 Windows Auth");
+                Console.WriteLine("  PerformanceMonitorInstaller.exe <server> <username> <password>     SQL Auth");
+                Console.WriteLine("  PerformanceMonitorInstaller.exe <server> <username>                SQL Auth (password via env var)");
+                Console.WriteLine();
+                Console.WriteLine("Options:");
+                Console.WriteLine("  -h, --help           Show this help message");
+                Console.WriteLine("  --reinstall          Drop existing database and perform clean install");
+                Console.WriteLine("  --reset-schedule     Reset collection schedule to recommended defaults");
+                Console.WriteLine("  --encrypt=<level>    Connection encryption: mandatory (default), optional, strict");
+                Console.WriteLine("  --trust-cert         Trust server certificate without validation");
+                Console.WriteLine();
+                Console.WriteLine("Environment Variables:");
+                Console.WriteLine("  PM_SQL_PASSWORD      SQL Auth password (avoids passing on command line)");
+                Console.WriteLine();
+                Console.WriteLine("Exit Codes:");
+                Console.WriteLine("  0  Success");
+                Console.WriteLine("  1  Invalid arguments");
+                Console.WriteLine("  2  Connection failed");
+                Console.WriteLine("  3  Critical file failed");
+                Console.WriteLine("  4  Partial installation (non-critical failures)");
+                Console.WriteLine("  5  Version check failed");
+                Console.WriteLine("  6  SQL files not found");
+                return 0;
+            }
+
             bool automatedMode = args.Length > 0;
             bool reinstallMode = args.Any(a => a.Equals("--reinstall", StringComparison.OrdinalIgnoreCase));
             bool resetSchedule = args.Any(a => a.Equals("--reset-schedule", StringComparison.OrdinalIgnoreCase));
@@ -619,7 +649,7 @@ INSERT...WHERE NOT EXISTS re-populates with current recommended values
                         */
                         if (resetSchedule && fileName.StartsWith("04_", StringComparison.Ordinal))
                         {
-                            sqlContent = "TRUNCATE TABLE config.collection_schedule;\nGO\n" + sqlContent;
+                            sqlContent = "TRUNCATE TABLE [PerformanceMonitor].[config].[collection_schedule];\nGO\n" + sqlContent;
                             Console.Write("(resetting schedule) ");
                         }
 
@@ -1125,17 +1155,22 @@ private static List<string> GetApplicableUpgrades(
                 return upgradeFolders;
             }
 
-            /*Parse current version - if invalid, skip upgrades*/
-            if (!Version.TryParse(currentVersion, out var current))
+            /*Parse current version - if invalid, skip upgrades
+              Normalize to 3-part (Major.Minor.Build) to avoid Revision mismatch:
+              folder names use 3-part "1.3.0" but DB stores 4-part "1.3.0.0"
+              Version(1,3,0).Revision=-1 which breaks >= comparison with Version(1,3,0,0)*/
+            if (!Version.TryParse(currentVersion, out var currentRaw))
             {
                 return upgradeFolders;
             }
+            var current = new Version(currentRaw.Major, currentRaw.Minor, currentRaw.Build);
 
             /*Parse target version - if invalid, skip upgrades*/
-            if (!Version.TryParse(targetVersion, out var target))
+            if (!Version.TryParse(targetVersion, out var targetRaw))
             {
                 return upgradeFolders;
             }
+            var target = new Version(targetRaw.Major, targetRaw.Minor, targetRaw.Build);
 
             /*
             Find all upgrade folders matching pattern: {from}-to-{to}
diff --git a/InstallerGui/InstallerGui.csproj b/InstallerGui/InstallerGui.csproj
index c9d3797a..3ea94972 100644
--- a/InstallerGui/InstallerGui.csproj
+++ b/InstallerGui/InstallerGui.csproj
@@ -8,10 +8,16 @@
     <AssemblyName>PerformanceMonitorInstallerGui</AssemblyName>
     <RootNamespace>PerformanceMonitorInstallerGui</RootNamespace>
     <Product>SQL Server Performance Monitor Installer</Product>
-    <Version>1.3.0</Version>
+    <Version>2.0.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <PublishTrimmed>false</PublishTrimmed>
+    <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
     <NoWarn>CA1849;CA2007;CA1508;CA1031;CA1001;CA1822;CA1305;CA2100;CA1002;CA1845;CA1861;CA2234;CA1062;CA1823</NoWarn>
diff --git a/InstallerGui/MainWindow.xaml.cs b/InstallerGui/MainWindow.xaml.cs
index a516f680..91a199d7 100644
--- a/InstallerGui/MainWindow.xaml.cs
+++ b/InstallerGui/MainWindow.xaml.cs
@@ -40,7 +40,9 @@ public partial class MainWindow : Window
         private static readonly SolidColorBrush WarningBrush = new(Color.FromRgb(0xFF, 0xC1, 0x07)); // Yellow
 
         /*
-        Cached version string
+        Cached version strings
+        Display version includes git hash suffix for UI/logs
+        Assembly version is clean (e.g. "2.0.0.0") for upgrade version comparison
         */
         private static readonly string AppVersion =
             Assembly.GetExecutingAssembly()
@@ -48,6 +50,10 @@ Cached version string
             ?? Assembly.GetExecutingAssembly().GetName().Version?.ToString()
             ?? "Unknown";
 
+        private static readonly string AppAssemblyVersion =
+            Assembly.GetExecutingAssembly().GetName().Version?.ToString()
+            ?? "Unknown";
+
         private static readonly char[] NewLineChars = { '\r', '\n' };
 
         public MainWindow()
@@ -260,7 +266,7 @@ private async void TestConnection_Click(object sender, RoutedEventArgs e)
                             var upgrades = InstallationService.GetApplicableUpgrades(
                                 _monitorRootDirectory,
                                 _installedVersion,
-                                AppVersion);
+                                AppAssemblyVersion);
                             if (upgrades.Count > 0)
                             {
                                 LogMessage($"Found {upgrades.Count} upgrade(s) to apply", "Warning");
@@ -377,7 +383,7 @@ private async void Install_Click(object sender, RoutedEventArgs e)
                         _monitorRootDirectory,
                         _connectionString,
                         _installedVersion,
-                        AppVersion,
+                        AppAssemblyVersion,
                         progress,
                         cancellationToken);
 
diff --git a/InstallerGui/Services/InstallationService.cs b/InstallerGui/Services/InstallationService.cs
index 7c061461..512a6ab3 100644
--- a/InstallerGui/Services/InstallationService.cs
+++ b/InstallerGui/Services/InstallationService.cs
@@ -414,7 +414,7 @@ Execute SQL files
                     /*Reset schedule to defaults if requested*/
                     if (resetSchedule && fileName.StartsWith("04_", StringComparison.Ordinal))
                     {
-                        sqlContent = "TRUNCATE TABLE config.collection_schedule;\nGO\n" + sqlContent;
+                        sqlContent = "TRUNCATE TABLE [PerformanceMonitor].[config].[collection_schedule];\nGO\n" + sqlContent;
                         progress?.Report(new InstallationProgress
                         {
                             Message = "Resetting schedule to recommended defaults...",
@@ -1053,17 +1053,22 @@ public static List<UpgradeInfo> GetApplicableUpgrades(
                 return upgrades;
             }
 
-            /*Parse current version - if invalid, skip upgrades*/
-            if (!Version.TryParse(currentVersion, out var current))
+            /*Parse current version - if invalid, skip upgrades
+              Normalize to 3-part (Major.Minor.Build) to avoid Revision mismatch:
+              folder names use 3-part "1.3.0" but DB stores 4-part "1.3.0.0"
+              Version(1,3,0).Revision=-1 which breaks >= comparison with Version(1,3,0,0)*/
+            if (!Version.TryParse(currentVersion, out var currentRaw))
             {
                 return upgrades;
             }
+            var current = new Version(currentRaw.Major, currentRaw.Minor, currentRaw.Build);
 
             /*Parse target version - if invalid, skip upgrades*/
-            if (!Version.TryParse(targetVersion, out var target))
+            if (!Version.TryParse(targetVersion, out var targetRaw))
             {
                 return upgrades;
             }
+            var target = new Version(targetRaw.Major, targetRaw.Minor, targetRaw.Build);
 
             /*
             Find all upgrade folders matching pattern: {from}-to-{to}
diff --git a/Lite.Tests/DuckDbSchemaTests.cs b/Lite.Tests/DuckDbSchemaTests.cs
index e8415ab5..a0460b36 100644
--- a/Lite.Tests/DuckDbSchemaTests.cs
+++ b/Lite.Tests/DuckDbSchemaTests.cs
@@ -72,13 +72,13 @@ public async Task InitializeAsync_CreatesAllTables()
         };
 
         using var connection = new DuckDBConnection($"Data Source={_dbPath}");
-        await connection.OpenAsync();
+        await connection.OpenAsync(TestContext.Current.CancellationToken);
 
         foreach (var table in expectedTables)
         {
             using var cmd = connection.CreateCommand();
             cmd.CommandText = $"SELECT COUNT(*) FROM information_schema.tables WHERE table_name = '{table}'";
-            var count = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+            var count = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
             Assert.True(count == 1, $"Table '{table}' should exist but was not found");
         }
     }
@@ -90,11 +90,11 @@ public async Task InitializeAsync_SetsCorrectSchemaVersion()
         await initializer.InitializeAsync();
 
         using var connection = new DuckDBConnection($"Data Source={_dbPath}");
-        await connection.OpenAsync();
+        await connection.OpenAsync(TestContext.Current.CancellationToken);
 
         using var cmd = connection.CreateCommand();
         cmd.CommandText = "SELECT MAX(version) FROM schema_version";
-        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
 
         Assert.Equal(DuckDbInitializer.CurrentSchemaVersion, version);
     }
@@ -109,11 +109,11 @@ public async Task InitializeAsync_IsIdempotent()
         await initializer.InitializeAsync();
 
         using var connection = new DuckDBConnection($"Data Source={_dbPath}");
-        await connection.OpenAsync();
+        await connection.OpenAsync(TestContext.Current.CancellationToken);
 
         using var cmd = connection.CreateCommand();
         cmd.CommandText = "SELECT MAX(version) FROM schema_version";
-        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+        var version = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
 
         Assert.Equal(DuckDbInitializer.CurrentSchemaVersion, version);
     }
@@ -147,12 +147,12 @@ public async Task InitializeAsync_CreatesIndexes()
         await initializer.InitializeAsync();
 
         using var connection = new DuckDBConnection($"Data Source={_dbPath}");
-        await connection.OpenAsync();
+        await connection.OpenAsync(TestContext.Current.CancellationToken);
 
         /* Verify at least some indexes exist by checking duckdb_indexes */
         using var cmd = connection.CreateCommand();
         cmd.CommandText = "SELECT COUNT(*) FROM duckdb_indexes()";
-        var indexCount = Convert.ToInt32(await cmd.ExecuteScalarAsync());
+        var indexCount = Convert.ToInt32(await cmd.ExecuteScalarAsync(TestContext.Current.CancellationToken));
 
         /* We create 18 indexes */
         Assert.True(indexCount >= 18, $"Expected >= 18 indexes, found {indexCount}");
diff --git a/Lite.Tests/Lite.Tests.csproj b/Lite.Tests/Lite.Tests.csproj
index 65bf423b..86268874 100644
--- a/Lite.Tests/Lite.Tests.csproj
+++ b/Lite.Tests/Lite.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
@@ -9,9 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lite/App.xaml.cs b/Lite/App.xaml.cs
index 950855c7..b2b7c802 100644
--- a/Lite/App.xaml.cs
+++ b/Lite/App.xaml.cs
@@ -65,6 +65,18 @@ public partial class App : Application
     public static bool AlertLongRunningJobEnabled { get; set; } = true;
     public static int AlertLongRunningJobMultiplier { get; set; } = 3;
 
+    /* Connection settings */
+    public static int ConnectionTimeoutSeconds { get; set; } = 5;
+
+    /* CSV export settings */
+    public static string CsvSeparator { get; set; } = GetDefaultCsvSeparator();
+
+    private static string GetDefaultCsvSeparator()
+    {
+        /* Auto-detect: use semicolon when the locale's decimal separator is a comma (Italian, German, French, etc.) */
+        return System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == "," ? ";" : ",";
+    }
+
     /* System tray settings */
     public static bool MinimizeToTray { get; set; } = true;
 
@@ -221,6 +233,20 @@ public static void LoadAlertSettings()
             if (root.TryGetProperty("alert_long_running_job_enabled", out v)) AlertLongRunningJobEnabled = v.GetBoolean();
             if (root.TryGetProperty("alert_long_running_job_multiplier", out v)) AlertLongRunningJobMultiplier = v.GetInt32();
 
+            /* Connection settings */
+            if (root.TryGetProperty("connection_timeout_seconds", out v))
+            {
+                var timeout = v.GetInt32();
+                if (timeout >= 5 && timeout <= 60) ConnectionTimeoutSeconds = timeout;
+            }
+
+            /* CSV export settings */
+            if (root.TryGetProperty("csv_separator", out v))
+            {
+                var sep = v.GetString();
+                if (sep == "," || sep == ";" || sep == "\t") CsvSeparator = sep;
+            }
+
             /* System tray settings */
             if (root.TryGetProperty("minimize_to_tray", out v)) MinimizeToTray = v.GetBoolean();
 
diff --git a/Lite/Controls/PlanViewerControl.xaml b/Lite/Controls/PlanViewerControl.xaml
new file mode 100644
index 00000000..cb398e19
--- /dev/null
+++ b/Lite/Controls/PlanViewerControl.xaml
@@ -0,0 +1,167 @@
+<UserControl x:Class="PerformanceMonitorLite.Controls.PlanViewerControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Background="{DynamicResource BackgroundBrush}">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- Toolbar -->
+        <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" Padding="8,6"
+                BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <DockPanel>
+                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                    <Button Content="+" Click="ZoomIn_Click" Width="28" Height="28" Padding="0" FontSize="16"
+                            FontWeight="Bold" ToolTip="Zoom In"/>
+                    <Button Content="&#x2212;" Click="ZoomOut_Click" Width="28" Height="28" Padding="0" FontSize="16"
+                            FontWeight="Bold" Margin="4,0,0,0" ToolTip="Zoom Out"/>
+                    <Button Content="Fit" Click="ZoomFit_Click" Height="28" Padding="8,0" Margin="4,0,0,0"
+                            ToolTip="Zoom to Fit"/>
+                    <TextBlock x:Name="ZoomLevelText" Text="100%" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundMutedBrush}" Margin="8,0,0,0" FontSize="11"/>
+                    <Separator Margin="12,4"/>
+                    <Button Content="Save .sqlplan" Click="SavePlan_Click" Height="28" Padding="8,0"
+                            ToolTip="Save plan as .sqlplan file"/>
+                    <Separator Margin="12,4"/>
+                    <TextBlock x:Name="StatementLabel" Text="Statement:" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundMutedBrush}" Margin="0,0,6,0"
+                               Visibility="Collapsed"/>
+                    <ComboBox x:Name="StatementSelector" MinWidth="200" Height="28"
+                              SelectionChanged="StatementSelector_Changed"
+                              Visibility="Collapsed"/>
+                </StackPanel>
+                <TextBlock x:Name="CostText" DockPanel.Dock="Right" VerticalAlignment="Center"
+                           HorizontalAlignment="Right"
+                           Foreground="{DynamicResource ForegroundMutedBrush}" FontSize="11"/>
+            </DockPanel>
+        </Border>
+
+        <!-- Missing Index Banner -->
+        <Border x:Name="MissingIndexBanner" Grid.Row="1" Padding="10,8"
+                Background="#3D2A0E" Visibility="Collapsed"
+                BorderBrush="#7A5A1E" BorderThickness="0,0,0,1">
+            <StackPanel>
+                <TextBlock Text="Missing Index Suggestions" FontWeight="SemiBold"
+                           Foreground="#FFB347" Margin="0,0,0,4"/>
+                <ItemsControl x:Name="MissingIndexList">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Margin="0,2">
+                                <TextBlock Foreground="#E4E6EB" FontSize="11" TextWrapping="Wrap">
+                                    <Run Text="{Binding Table, Mode=OneWay}" FontWeight="SemiBold"/>
+                                    <Run Text=" — Impact: "/>
+                                    <Run Text="{Binding Impact, StringFormat={}{0:F1}%, Mode=OneWay}" Foreground="#FFB347"/>
+                                </TextBlock>
+                                <TextBlock Text="{Binding CreateStatement, Mode=OneWay}" FontFamily="Consolas" FontSize="10"
+                                           Foreground="{DynamicResource ForegroundMutedBrush}" TextWrapping="Wrap"
+                                           Margin="12,2,0,0"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </StackPanel>
+        </Border>
+
+        <!-- Warnings Banner -->
+        <Border x:Name="WarningsBanner" Grid.Row="2" Padding="10,6"
+                Background="#3D1A1A" Visibility="Collapsed"
+                BorderBrush="#7A2A2A" BorderThickness="0,0,0,1">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="&#x26A0;" Foreground="#E57373" FontSize="14" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                <TextBlock x:Name="WarningsSummaryText" Foreground="#E57373" VerticalAlignment="Center" FontSize="12"/>
+            </StackPanel>
+        </Border>
+
+        <!-- Query Text (collapsible) -->
+        <Expander Grid.Row="3" x:Name="QueryTextExpander" Header="  Query Text"
+                  IsExpanded="False" Visibility="Collapsed"
+                  Foreground="{DynamicResource ForegroundBrush}"
+                  Background="{DynamicResource BackgroundDarkBrush}"
+                  BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+            <TextBox x:Name="QueryTextBox" IsReadOnly="True"
+                     FontFamily="Consolas" FontSize="11"
+                     Background="{DynamicResource BackgroundLightBrush}"
+                     Foreground="{DynamicResource ForegroundBrush}"
+                     BorderThickness="0" TextWrapping="Wrap"
+                     MaxHeight="200" VerticalScrollBarVisibility="Auto"
+                     Padding="8,4"/>
+        </Expander>
+
+        <!-- Plan Canvas + Properties Panel -->
+        <Grid Grid.Row="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition x:Name="PropertiesColumn" Width="0"/>
+            </Grid.ColumnDefinitions>
+
+            <!-- Plan Canvas -->
+            <ScrollViewer Grid.Column="0" x:Name="PlanScrollViewer"
+                          HorizontalScrollBarVisibility="Auto"
+                          VerticalScrollBarVisibility="Auto"
+                          Background="{DynamicResource BackgroundBrush}"
+                          PreviewMouseWheel="PlanScrollViewer_PreviewMouseWheel">
+                <Canvas x:Name="PlanCanvas" ClipToBounds="False">
+                    <Canvas.LayoutTransform>
+                        <ScaleTransform x:Name="ZoomTransform" ScaleX="1" ScaleY="1"/>
+                    </Canvas.LayoutTransform>
+                </Canvas>
+            </ScrollViewer>
+
+            <!-- Empty State -->
+            <StackPanel x:Name="EmptyState" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
+                           Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
+                <TextBlock Text="Right-click a query row and choose 'View Plan' to display an execution plan here"
+                           FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
+                           HorizontalAlignment="Center" Margin="0,8,0,0"/>
+            </StackPanel>
+
+            <!-- GridSplitter -->
+            <GridSplitter x:Name="PropertiesSplitter" Grid.Column="1" Width="5"
+                          HorizontalAlignment="Center" VerticalAlignment="Stretch"
+                          Background="{DynamicResource BorderBrush}"
+                          Visibility="Collapsed"/>
+
+            <!-- Properties Panel -->
+            <Border x:Name="PropertiesPanel" Grid.Column="2"
+                    Background="{DynamicResource BackgroundDarkBrush}"
+                    BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1,0,0,0"
+                    Visibility="Collapsed">
+                <DockPanel>
+                    <!-- Header -->
+                    <Border DockPanel.Dock="Top" Padding="10,8"
+                            Background="{DynamicResource BackgroundBrush}"
+                            BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
+                        <DockPanel>
+                            <Button DockPanel.Dock="Right" Content="&#x2715;" Click="CloseProperties_Click"
+                                    Width="24" Height="24" Padding="0" FontSize="12"
+                                    VerticalAlignment="Center" ToolTip="Close Properties"
+                                    Background="Transparent" BorderThickness="0"
+                                    Foreground="{DynamicResource ForegroundMutedBrush}"/>
+                            <StackPanel>
+                                <TextBlock x:Name="PropertiesHeader" Text="Operator Properties"
+                                           FontWeight="SemiBold" FontSize="13"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
+                                <TextBlock x:Name="PropertiesSubHeader" FontSize="11"
+                                           Foreground="{DynamicResource ForegroundMutedBrush}"
+                                           Margin="0,2,0,0"/>
+                            </StackPanel>
+                        </DockPanel>
+                    </Border>
+
+                    <!-- Properties Content -->
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
+                                  Padding="0">
+                        <StackPanel x:Name="PropertiesContent" Margin="0"/>
+                    </ScrollViewer>
+                </DockPanel>
+            </Border>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Lite/Controls/PlanViewerControl.xaml.cs b/Lite/Controls/PlanViewerControl.xaml.cs
new file mode 100644
index 00000000..9b17ad54
--- /dev/null
+++ b/Lite/Controls/PlanViewerControl.xaml.cs
@@ -0,0 +1,1480 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Microsoft.Win32;
+using PerformanceMonitorLite.Models;
+using PerformanceMonitorLite.Services;
+
+using WpfPath = System.Windows.Shapes.Path;
+
+namespace PerformanceMonitorLite.Controls;
+
+public partial class PlanViewerControl : UserControl
+{
+    private ParsedPlan? _currentPlan;
+    private PlanStatement? _currentStatement;
+    private double _zoomLevel = 1.0;
+    private const double ZoomStep = 0.15;
+    private const double MinZoom = 0.1;
+    private const double MaxZoom = 3.0;
+    private string _label = "";
+
+    // Node selection
+    private Border? _selectedNodeBorder;
+    private Brush? _selectedNodeOriginalBorder;
+    private Thickness _selectedNodeOriginalThickness;
+
+    // Brushes
+    private static readonly SolidColorBrush SelectionBrush = new(Color.FromRgb(0x4F, 0xA3, 0xFF));
+    private static readonly SolidColorBrush TooltipBgBrush = new(Color.FromRgb(0x1A, 0x1D, 0x23));
+    private static readonly SolidColorBrush TooltipBorderBrush = new(Color.FromRgb(0x3A, 0x3D, 0x45));
+    private static readonly SolidColorBrush TooltipFgBrush = new(Color.FromRgb(0xE4, 0xE6, 0xEB));
+    private static readonly SolidColorBrush MutedBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
+    private static readonly SolidColorBrush EdgeBrush = new(Color.FromRgb(0x6B, 0x72, 0x80));
+    private static readonly SolidColorBrush SectionHeaderBrush = new(Color.FromRgb(0x4F, 0xA3, 0xFF));
+    private static readonly SolidColorBrush PropSeparatorBrush = new(Color.FromRgb(0x2A, 0x2D, 0x35));
+
+    // Current property section for collapsible groups
+    private StackPanel? _currentPropertySection;
+
+    public PlanViewerControl()
+    {
+        InitializeComponent();
+    }
+
+    public void LoadPlan(string planXml, string label, string? queryText = null)
+    {
+        _label = label;
+
+        if (!string.IsNullOrEmpty(queryText))
+        {
+            QueryTextBox.Text = queryText;
+            QueryTextExpander.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            QueryTextExpander.Visibility = Visibility.Collapsed;
+        }
+        _currentPlan = ShowPlanParser.Parse(planXml);
+        PlanAnalyzer.Analyze(_currentPlan);
+
+        var allStatements = _currentPlan.Batches
+            .SelectMany(b => b.Statements)
+            .Where(s => s.RootNode != null)
+            .ToList();
+
+        if (allStatements.Count == 0)
+        {
+            EmptyState.Visibility = Visibility.Visible;
+            PlanScrollViewer.Visibility = Visibility.Collapsed;
+            return;
+        }
+
+        EmptyState.Visibility = Visibility.Collapsed;
+        PlanScrollViewer.Visibility = Visibility.Visible;
+
+        // Populate statement selector
+        if (allStatements.Count > 1)
+        {
+            StatementSelector.Items.Clear();
+            for (int i = 0; i < allStatements.Count; i++)
+            {
+                var s = allStatements[i];
+                var text = s.StatementText.Length > 80
+                    ? s.StatementText[..80] + "..."
+                    : s.StatementText;
+                if (string.IsNullOrWhiteSpace(text))
+                    text = $"Statement {i + 1}";
+                StatementSelector.Items.Add(new ComboBoxItem
+                {
+                    Content = $"[{s.StatementSubTreeCost:F4}] {text}",
+                    Tag = i
+                });
+            }
+            StatementSelector.SelectedIndex = 0;
+            StatementLabel.Visibility = Visibility.Visible;
+            StatementSelector.Visibility = Visibility.Visible;
+            CostText.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            StatementLabel.Visibility = Visibility.Collapsed;
+            StatementSelector.Visibility = Visibility.Collapsed;
+            CostText.Visibility = Visibility.Collapsed;
+            RenderStatement(allStatements[0]);
+        }
+    }
+
+    public void Clear()
+    {
+        PlanCanvas.Children.Clear();
+        _currentPlan = null;
+        _currentStatement = null;
+        _selectedNodeBorder = null;
+        EmptyState.Visibility = Visibility.Visible;
+        PlanScrollViewer.Visibility = Visibility.Collapsed;
+        MissingIndexBanner.Visibility = Visibility.Collapsed;
+        WarningsBanner.Visibility = Visibility.Collapsed;
+        StatementLabel.Visibility = Visibility.Collapsed;
+        StatementSelector.Visibility = Visibility.Collapsed;
+        CostText.Text = "";
+        CostText.Visibility = Visibility.Collapsed;
+        ClosePropertiesPanel();
+    }
+
+    private void RenderStatement(PlanStatement statement)
+    {
+        _currentStatement = statement;
+        PlanCanvas.Children.Clear();
+        _selectedNodeBorder = null;
+
+        if (statement.RootNode == null) return;
+
+        // Layout
+        PlanLayoutEngine.Layout(statement);
+        var (width, height) = PlanLayoutEngine.GetExtents(statement.RootNode);
+        PlanCanvas.Width = width;
+        PlanCanvas.Height = height;
+
+        // Render edges first (behind nodes)
+        RenderEdges(statement.RootNode);
+
+        // Render nodes
+        RenderNodes(statement.RootNode);
+
+        // Update banners
+        ShowMissingIndexes(statement.MissingIndexes);
+        ShowWarnings(statement.RootNode);
+
+        // Update cost text
+        CostText.Text = $"Statement Cost: {statement.StatementSubTreeCost:F4}";
+    }
+
+    #region Node Rendering
+
+    private void RenderNodes(PlanNode node)
+    {
+        var visual = CreateNodeVisual(node);
+        Canvas.SetLeft(visual, node.X);
+        Canvas.SetTop(visual, node.Y);
+        PlanCanvas.Children.Add(visual);
+
+        foreach (var child in node.Children)
+            RenderNodes(child);
+    }
+
+    private Border CreateNodeVisual(PlanNode node)
+    {
+        var isExpensive = node.IsExpensive;
+
+        var border = new Border
+        {
+            Width = PlanLayoutEngine.NodeWidth,
+            MinHeight = PlanLayoutEngine.NodeHeightMin,
+            Background = isExpensive
+                ? new SolidColorBrush(Color.FromArgb(0x30, 0xE5, 0x73, 0x73))
+                : (Brush)FindResource("BackgroundLightBrush"),
+            BorderBrush = isExpensive
+                ? Brushes.OrangeRed
+                : (Brush)FindResource("BorderBrush"),
+            BorderThickness = new Thickness(isExpensive ? 2 : 1),
+            CornerRadius = new CornerRadius(4),
+            Padding = new Thickness(6, 4, 6, 4),
+            ToolTip = BuildNodeTooltip(node),
+            Cursor = Cursors.Hand,
+            SnapsToDevicePixels = true,
+            Tag = node
+        };
+
+        // Click to select + show properties
+        border.MouseLeftButtonUp += Node_Click;
+
+        // Right-click context menu
+        border.ContextMenu = BuildNodeContextMenu(node);
+
+        var stack = new StackPanel { HorizontalAlignment = HorizontalAlignment.Center };
+
+        // Icon row: icon + optional warning/parallel indicators
+        var iconRow = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center };
+
+        var icon = PlanIconMapper.GetIcon(node.IconName);
+        if (icon != null)
+        {
+            iconRow.Children.Add(new Image
+            {
+                Source = icon,
+                Width = 32,
+                Height = 32,
+                Margin = new Thickness(0, 0, 0, 2)
+            });
+        }
+
+        // Warning indicator badge (orange triangle with !)
+        if (node.HasWarnings)
+        {
+            var warnBadge = new Grid
+            {
+                Width = 20, Height = 20,
+                Margin = new Thickness(4, 0, 0, 0),
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            warnBadge.Children.Add(new Polygon
+            {
+                Points = new PointCollection
+                {
+                    new Point(10, 0), new Point(20, 18), new Point(0, 18)
+                },
+                Fill = Brushes.Orange
+            });
+            warnBadge.Children.Add(new TextBlock
+            {
+                Text = "!",
+                FontSize = 12,
+                FontWeight = FontWeights.ExtraBold,
+                Foreground = Brushes.White,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Margin = new Thickness(0, 3, 0, 0)
+            });
+            iconRow.Children.Add(warnBadge);
+        }
+
+        // Parallel indicator badge (amber circle with arrows)
+        if (node.Parallel)
+        {
+            var parBadge = new Grid
+            {
+                Width = 20, Height = 20,
+                Margin = new Thickness(4, 0, 0, 0),
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            parBadge.Children.Add(new Ellipse
+            {
+                Width = 20, Height = 20,
+                Fill = new SolidColorBrush(Color.FromRgb(0xFF, 0xC1, 0x07))
+            });
+            parBadge.Children.Add(new TextBlock
+            {
+                Text = "\u21C6",
+                FontSize = 12,
+                FontWeight = FontWeights.Bold,
+                Foreground = new SolidColorBrush(Color.FromRgb(0x33, 0x33, 0x33)),
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            });
+            iconRow.Children.Add(parBadge);
+        }
+
+        stack.Children.Add(iconRow);
+
+        // Operator name — use full name, let TextTrimming handle overflow
+        stack.Children.Add(new TextBlock
+        {
+            Text = node.PhysicalOp,
+            FontSize = 10,
+            FontWeight = FontWeights.SemiBold,
+            Foreground = (Brush)FindResource("ForegroundBrush"),
+            TextAlignment = TextAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            MaxWidth = PlanLayoutEngine.NodeWidth - 16,
+            HorizontalAlignment = HorizontalAlignment.Center
+        });
+
+        // Cost percentage
+        var costColor = node.CostPercent >= 50 ? Brushes.OrangeRed
+            : node.CostPercent >= 25 ? Brushes.Orange
+            : (Brush)FindResource("ForegroundBrush");
+
+        stack.Children.Add(new TextBlock
+        {
+            Text = $"Cost: {node.CostPercent}%",
+            FontSize = 10,
+            Foreground = costColor,
+            TextAlignment = TextAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center
+        });
+
+        // Actual plan stats: elapsed time, CPU time, and row counts
+        if (node.HasActualStats)
+        {
+            var fgBrush = (Brush)FindResource("ForegroundBrush");
+
+            // Elapsed time — red if >= 1 second
+            var elapsedSec = node.ActualElapsedMs / 1000.0;
+            var elapsedBrush = elapsedSec >= 1.0 ? Brushes.OrangeRed : fgBrush;
+            stack.Children.Add(new TextBlock
+            {
+                Text = $"{elapsedSec:F3}s",
+                FontSize = 10,
+                Foreground = elapsedBrush,
+                TextAlignment = TextAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+
+            // CPU time — red if >= 1 second
+            var cpuSec = node.ActualCPUMs / 1000.0;
+            var cpuBrush = cpuSec >= 1.0 ? Brushes.OrangeRed : fgBrush;
+            stack.Children.Add(new TextBlock
+            {
+                Text = $"CPU: {cpuSec:F3}s",
+                FontSize = 9,
+                Foreground = cpuBrush,
+                TextAlignment = TextAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center
+            });
+
+            // Actual rows of Estimated rows (accuracy %) — red if off by 10x+
+            var estRows = node.EstimateRows;
+            var accuracyRatio = estRows > 0 ? node.ActualRows / estRows : (node.ActualRows > 0 ? double.MaxValue : 1.0);
+            var rowBrush = (accuracyRatio < 0.1 || accuracyRatio > 10.0) ? Brushes.OrangeRed : fgBrush;
+            var accuracy = estRows > 0
+                ? $" ({accuracyRatio * 100:F0}%)"
+                : "";
+            stack.Children.Add(new TextBlock
+            {
+                Text = $"{node.ActualRows:N0} of {estRows:N0}{accuracy}",
+                FontSize = 9,
+                Foreground = rowBrush,
+                TextAlignment = TextAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                MaxWidth = PlanLayoutEngine.NodeWidth - 16
+            });
+        }
+
+        // Object name — show full object name, use ellipsis for overflow
+        if (!string.IsNullOrEmpty(node.ObjectName))
+        {
+            stack.Children.Add(new TextBlock
+            {
+                Text = node.FullObjectName ?? node.ObjectName,
+                FontSize = 9,
+                Foreground = (Brush)FindResource("ForegroundBrush"),
+                TextAlignment = TextAlignment.Center,
+                TextTrimming = TextTrimming.CharacterEllipsis,
+                MaxWidth = PlanLayoutEngine.NodeWidth - 16,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                ToolTip = node.FullObjectName ?? node.ObjectName
+            });
+        }
+
+        border.Child = stack;
+        return border;
+    }
+
+    #endregion
+
+    #region Edge Rendering
+
+    private void RenderEdges(PlanNode node)
+    {
+        foreach (var child in node.Children)
+        {
+            var path = CreateElbowConnector(node, child);
+            PlanCanvas.Children.Add(path);
+
+            RenderEdges(child);
+        }
+    }
+
+    private WpfPath CreateElbowConnector(PlanNode parent, PlanNode child)
+    {
+        var parentRight = parent.X + PlanLayoutEngine.NodeWidth;
+        var parentCenterY = parent.Y + PlanLayoutEngine.GetNodeHeight(parent) / 2;
+        var childLeft = child.X;
+        var childCenterY = child.Y + PlanLayoutEngine.GetNodeHeight(child) / 2;
+
+        // Arrow thickness based on row estimate (logarithmic)
+        var rows = child.HasActualStats ? child.ActualRows : child.EstimateRows;
+        var thickness = Math.Max(2, Math.Min(Math.Floor(Math.Log(Math.Max(1, rows))), 12));
+
+        var midX = (parentRight + childLeft) / 2;
+
+        var geometry = new PathGeometry();
+        var figure = new PathFigure
+        {
+            StartPoint = new Point(parentRight, parentCenterY),
+            IsClosed = false
+        };
+        figure.Segments.Add(new LineSegment(new Point(midX, parentCenterY), true));
+        figure.Segments.Add(new LineSegment(new Point(midX, childCenterY), true));
+        figure.Segments.Add(new LineSegment(new Point(childLeft, childCenterY), true));
+        geometry.Figures.Add(figure);
+
+        var rowText = child.HasActualStats
+            ? $"Actual Rows: {child.ActualRows:N0}"
+            : $"Estimated Rows: {child.EstimateRows:N0}";
+
+        return new WpfPath
+        {
+            Data = geometry,
+            Stroke = EdgeBrush,
+            StrokeThickness = thickness,
+            StrokeLineJoin = PenLineJoin.Round,
+            ToolTip = rowText,
+            SnapsToDevicePixels = true
+        };
+    }
+
+    #endregion
+
+    #region Node Selection & Properties Panel
+
+    private void Node_Click(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is Border border && border.Tag is PlanNode node)
+        {
+            SelectNode(border, node);
+            e.Handled = true;
+        }
+    }
+
+    private void SelectNode(Border border, PlanNode node)
+    {
+        // Deselect previous
+        if (_selectedNodeBorder != null)
+        {
+            _selectedNodeBorder.BorderBrush = _selectedNodeOriginalBorder;
+            _selectedNodeBorder.BorderThickness = _selectedNodeOriginalThickness;
+        }
+
+        // Select new
+        _selectedNodeOriginalBorder = border.BorderBrush;
+        _selectedNodeOriginalThickness = border.BorderThickness;
+        _selectedNodeBorder = border;
+        border.BorderBrush = SelectionBrush;
+        border.BorderThickness = new Thickness(2);
+
+        ShowPropertiesPanel(node);
+    }
+
+    private ContextMenu BuildNodeContextMenu(PlanNode node)
+    {
+        var menu = new ContextMenu();
+
+        var propsItem = new MenuItem { Header = "Properties" };
+        propsItem.Click += (_, _) =>
+        {
+            // Find the border for this node by checking Tags
+            foreach (var child in PlanCanvas.Children)
+            {
+                if (child is Border b && b.Tag == node)
+                {
+                    SelectNode(b, node);
+                    break;
+                }
+            }
+        };
+        menu.Items.Add(propsItem);
+
+        menu.Items.Add(new Separator());
+
+        var copyOpItem = new MenuItem { Header = "Copy Operator Name" };
+        copyOpItem.Click += (_, _) => Clipboard.SetDataObject(node.PhysicalOp, false);
+        menu.Items.Add(copyOpItem);
+
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            var copyObjItem = new MenuItem { Header = "Copy Object Name" };
+            copyObjItem.Click += (_, _) => Clipboard.SetDataObject(node.FullObjectName, false);
+            menu.Items.Add(copyObjItem);
+        }
+
+        if (!string.IsNullOrEmpty(node.Predicate))
+        {
+            var copyPredItem = new MenuItem { Header = "Copy Predicate" };
+            copyPredItem.Click += (_, _) => Clipboard.SetDataObject(node.Predicate, false);
+            menu.Items.Add(copyPredItem);
+        }
+
+        if (!string.IsNullOrEmpty(node.SeekPredicates))
+        {
+            var copySeekItem = new MenuItem { Header = "Copy Seek Predicate" };
+            copySeekItem.Click += (_, _) => Clipboard.SetDataObject(node.SeekPredicates, false);
+            menu.Items.Add(copySeekItem);
+        }
+
+        return menu;
+    }
+
+    private void ShowPropertiesPanel(PlanNode node)
+    {
+        PropertiesContent.Children.Clear();
+        _currentPropertySection = null;
+
+        // Header
+        var headerText = node.PhysicalOp;
+        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp))
+            headerText += $" ({node.LogicalOp})";
+        PropertiesHeader.Text = headerText;
+        PropertiesSubHeader.Text = $"Node ID: {node.NodeId}";
+
+        // === General Section ===
+        AddPropertySection("General");
+        AddPropertyRow("Physical Operation", node.PhysicalOp);
+        AddPropertyRow("Logical Operation", node.LogicalOp);
+        AddPropertyRow("Node ID", $"{node.NodeId}");
+        if (!string.IsNullOrEmpty(node.ExecutionMode))
+            AddPropertyRow("Execution Mode", node.ExecutionMode);
+        if (!string.IsNullOrEmpty(node.ActualExecutionMode) && node.ActualExecutionMode != node.ExecutionMode)
+            AddPropertyRow("Actual Exec Mode", node.ActualExecutionMode);
+        AddPropertyRow("Parallel", node.Parallel ? "True" : "False");
+        if (node.Partitioned)
+            AddPropertyRow("Partitioned", "True");
+        if (node.EstimatedDOP > 0)
+            AddPropertyRow("Estimated DOP", $"{node.EstimatedDOP}");
+
+        // Scan/seek-related properties — always show for operators that have object references
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            AddPropertyRow("Ordered", node.Ordered ? "True" : "False");
+            if (!string.IsNullOrEmpty(node.ScanDirection))
+                AddPropertyRow("Scan Direction", node.ScanDirection);
+            AddPropertyRow("Forced Index", node.ForcedIndex ? "True" : "False");
+            AddPropertyRow("ForceScan", node.ForceScan ? "True" : "False");
+            AddPropertyRow("ForceSeek", node.ForceSeek ? "True" : "False");
+            AddPropertyRow("NoExpandHint", node.NoExpandHint ? "True" : "False");
+            if (node.Lookup)
+                AddPropertyRow("Lookup", "True");
+            if (node.DynamicSeek)
+                AddPropertyRow("Dynamic Seek", "True");
+        }
+
+        if (!string.IsNullOrEmpty(node.StorageType))
+            AddPropertyRow("Storage", node.StorageType);
+        if (node.IsAdaptive)
+            AddPropertyRow("Adaptive", "True");
+
+        // === Object Section ===
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            AddPropertySection("Object");
+            AddPropertyRow("Full Name", node.FullObjectName, isCode: true);
+            if (!string.IsNullOrEmpty(node.DatabaseName))
+                AddPropertyRow("Database", node.DatabaseName);
+            if (!string.IsNullOrEmpty(node.IndexName))
+                AddPropertyRow("Index", node.IndexName);
+        }
+
+        // === Operator Details Section ===
+        var hasOperatorDetails = !string.IsNullOrEmpty(node.OrderBy)
+            || !string.IsNullOrEmpty(node.TopExpression)
+            || !string.IsNullOrEmpty(node.GroupBy)
+            || !string.IsNullOrEmpty(node.PartitionColumns)
+            || !string.IsNullOrEmpty(node.HashKeys)
+            || !string.IsNullOrEmpty(node.SegmentColumn)
+            || !string.IsNullOrEmpty(node.DefinedValues)
+            || !string.IsNullOrEmpty(node.OuterReferences)
+            || !string.IsNullOrEmpty(node.InnerSideJoinColumns)
+            || !string.IsNullOrEmpty(node.OuterSideJoinColumns)
+            || !string.IsNullOrEmpty(node.ActionColumn)
+            || node.ManyToMany || node.BitmapCreator
+            || node.SortDistinct || node.StartupExpression
+            || node.NLOptimized || node.WithOrderedPrefetch || node.WithUnorderedPrefetch
+            || node.WithTies || node.Remoting || node.LocalParallelism
+            || node.SpoolStack || node.DMLRequestSort
+            || !string.IsNullOrEmpty(node.OffsetExpression) || node.TopRows > 0;
+
+        if (hasOperatorDetails)
+        {
+            AddPropertySection("Operator Details");
+            if (!string.IsNullOrEmpty(node.OrderBy))
+                AddPropertyRow("Order By", node.OrderBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.TopExpression))
+            {
+                var topText = node.TopExpression;
+                if (node.IsPercent) topText += " PERCENT";
+                if (node.WithTies) topText += " WITH TIES";
+                AddPropertyRow("Top", topText);
+            }
+            if (node.SortDistinct)
+                AddPropertyRow("Distinct Sort", "True");
+            if (node.StartupExpression)
+                AddPropertyRow("Startup Expression", "True");
+            if (node.NLOptimized)
+                AddPropertyRow("Optimized", "True");
+            if (node.WithOrderedPrefetch)
+                AddPropertyRow("Ordered Prefetch", "True");
+            if (node.WithUnorderedPrefetch)
+                AddPropertyRow("Unordered Prefetch", "True");
+            if (node.BitmapCreator)
+                AddPropertyRow("Bitmap Creator", "True");
+            if (node.Remoting)
+                AddPropertyRow("Remoting", "True");
+            if (node.LocalParallelism)
+                AddPropertyRow("Local Parallelism", "True");
+            if (!string.IsNullOrEmpty(node.GroupBy))
+                AddPropertyRow("Group By", node.GroupBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.PartitionColumns))
+                AddPropertyRow("Partition Columns", node.PartitionColumns, isCode: true);
+            if (!string.IsNullOrEmpty(node.HashKeys))
+                AddPropertyRow("Hash Keys", node.HashKeys, isCode: true);
+            if (!string.IsNullOrEmpty(node.OffsetExpression))
+                AddPropertyRow("Offset", node.OffsetExpression);
+            if (node.TopRows > 0)
+                AddPropertyRow("Rows", $"{node.TopRows}");
+            if (node.SpoolStack)
+                AddPropertyRow("Stack Spool", "True");
+            if (node.PrimaryNodeId > 0)
+                AddPropertyRow("Primary Node Id", $"{node.PrimaryNodeId}");
+            if (node.DMLRequestSort)
+                AddPropertyRow("DML Request Sort", "True");
+            if (!string.IsNullOrEmpty(node.ActionColumn))
+                AddPropertyRow("Action Column", node.ActionColumn, isCode: true);
+            if (!string.IsNullOrEmpty(node.SegmentColumn))
+                AddPropertyRow("Segment Column", node.SegmentColumn, isCode: true);
+            if (!string.IsNullOrEmpty(node.DefinedValues))
+                AddPropertyRow("Defined Values", node.DefinedValues, isCode: true);
+            if (!string.IsNullOrEmpty(node.OuterReferences))
+                AddPropertyRow("Outer References", node.OuterReferences, isCode: true);
+            if (!string.IsNullOrEmpty(node.InnerSideJoinColumns))
+                AddPropertyRow("Inner Join Cols", node.InnerSideJoinColumns, isCode: true);
+            if (!string.IsNullOrEmpty(node.OuterSideJoinColumns))
+                AddPropertyRow("Outer Join Cols", node.OuterSideJoinColumns, isCode: true);
+            if (node.ManyToMany)
+                AddPropertyRow("Many to Many", "True");
+        }
+
+        // === Adaptive Join Section ===
+        if (node.IsAdaptive)
+        {
+            AddPropertySection("Adaptive Join");
+            if (!string.IsNullOrEmpty(node.EstimatedJoinType))
+                AddPropertyRow("Est. Join Type", node.EstimatedJoinType);
+            if (!string.IsNullOrEmpty(node.ActualJoinType))
+                AddPropertyRow("Actual Join Type", node.ActualJoinType);
+            if (node.AdaptiveThresholdRows > 0)
+                AddPropertyRow("Threshold Rows", $"{node.AdaptiveThresholdRows:N1}");
+        }
+
+        // === Estimated Costs Section ===
+        AddPropertySection("Estimated Costs");
+        AddPropertyRow("Operator Cost", $"{node.EstimatedOperatorCost:F6} ({node.CostPercent}%)");
+        AddPropertyRow("Subtree Cost", $"{node.EstimatedTotalSubtreeCost:F6}");
+        AddPropertyRow("I/O Cost", $"{node.EstimateIO:F6}");
+        AddPropertyRow("CPU Cost", $"{node.EstimateCPU:F6}");
+
+        // === Estimated Rows Section ===
+        AddPropertySection("Estimated Rows");
+        var estExecs = 1 + node.EstimateRebinds;
+        AddPropertyRow("Est. Executions", $"{estExecs:N0}");
+        AddPropertyRow("Est. Rows Per Exec", $"{node.EstimateRows:N1}");
+        AddPropertyRow("Est. Rows All Execs", $"{node.EstimateRows * Math.Max(1, estExecs):N1}");
+        if (node.EstimatedRowsRead > 0)
+            AddPropertyRow("Est. Rows to Read", $"{node.EstimatedRowsRead:N1}");
+        if (node.TableCardinality > 0)
+            AddPropertyRow("Table Cardinality", $"{node.TableCardinality:N0}");
+        AddPropertyRow("Avg Row Size", $"{node.EstimatedRowSize} B");
+        AddPropertyRow("Est. Rebinds", $"{node.EstimateRebinds:N1}");
+        AddPropertyRow("Est. Rewinds", $"{node.EstimateRewinds:N1}");
+
+        // === Actual Stats Section (if actual plan) ===
+        if (node.HasActualStats)
+        {
+            AddPropertySection("Actual Statistics");
+            AddPropertyRow("Actual Rows", $"{node.ActualRows:N0}");
+            if (node.ActualRowsRead > 0)
+                AddPropertyRow("Actual Rows Read", $"{node.ActualRowsRead:N0}");
+            AddPropertyRow("Actual Executions", $"{node.ActualExecutions:N0}");
+            if (node.ActualRebinds > 0)
+                AddPropertyRow("Actual Rebinds", $"{node.ActualRebinds:N0}");
+            if (node.ActualRewinds > 0)
+                AddPropertyRow("Actual Rewinds", $"{node.ActualRewinds:N0}");
+
+            // Runtime partition summary
+            if (node.PartitionsAccessed > 0)
+            {
+                AddPropertyRow("Partitions Accessed", $"{node.PartitionsAccessed}");
+                if (!string.IsNullOrEmpty(node.PartitionRanges))
+                    AddPropertyRow("Partition Ranges", node.PartitionRanges);
+            }
+
+            // Timing
+            if (node.ActualElapsedMs > 0 || node.ActualCPUMs > 0
+                || node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+            {
+                AddPropertySection("Actual Timing");
+                if (node.ActualElapsedMs > 0)
+                    AddPropertyRow("Elapsed Time", $"{node.ActualElapsedMs:N0} ms");
+                if (node.ActualCPUMs > 0)
+                    AddPropertyRow("CPU Time", $"{node.ActualCPUMs:N0} ms");
+                if (node.UdfElapsedTimeUs > 0)
+                    AddPropertyRow("UDF Elapsed", $"{node.UdfElapsedTimeUs:N0} us");
+                if (node.UdfCpuTimeUs > 0)
+                    AddPropertyRow("UDF CPU", $"{node.UdfCpuTimeUs:N0} us");
+            }
+
+            // I/O
+            var hasIo = node.ActualLogicalReads > 0 || node.ActualPhysicalReads > 0
+                || node.ActualScans > 0 || node.ActualReadAheads > 0
+                || node.ActualSegmentReads > 0 || node.ActualSegmentSkips > 0;
+            if (hasIo)
+            {
+                AddPropertySection("Actual I/O");
+                AddPropertyRow("Logical Reads", $"{node.ActualLogicalReads:N0}");
+                if (node.ActualPhysicalReads > 0)
+                    AddPropertyRow("Physical Reads", $"{node.ActualPhysicalReads:N0}");
+                if (node.ActualScans > 0)
+                    AddPropertyRow("Scans", $"{node.ActualScans:N0}");
+                if (node.ActualReadAheads > 0)
+                    AddPropertyRow("Read-Ahead Reads", $"{node.ActualReadAheads:N0}");
+                if (node.ActualSegmentReads > 0)
+                    AddPropertyRow("Segment Reads", $"{node.ActualSegmentReads:N0}");
+                if (node.ActualSegmentSkips > 0)
+                    AddPropertyRow("Segment Skips", $"{node.ActualSegmentSkips:N0}");
+            }
+
+            // LOB I/O
+            var hasLobIo = node.ActualLobLogicalReads > 0 || node.ActualLobPhysicalReads > 0
+                || node.ActualLobReadAheads > 0;
+            if (hasLobIo)
+            {
+                AddPropertySection("Actual LOB I/O");
+                if (node.ActualLobLogicalReads > 0)
+                    AddPropertyRow("LOB Logical Reads", $"{node.ActualLobLogicalReads:N0}");
+                if (node.ActualLobPhysicalReads > 0)
+                    AddPropertyRow("LOB Physical Reads", $"{node.ActualLobPhysicalReads:N0}");
+                if (node.ActualLobReadAheads > 0)
+                    AddPropertyRow("LOB Read-Aheads", $"{node.ActualLobReadAheads:N0}");
+            }
+        }
+
+        // === Predicates Section ===
+        var hasPredicates = !string.IsNullOrEmpty(node.SeekPredicates) || !string.IsNullOrEmpty(node.Predicate)
+            || !string.IsNullOrEmpty(node.HashKeysProbe) || !string.IsNullOrEmpty(node.HashKeysBuild)
+            || !string.IsNullOrEmpty(node.BuildResidual) || !string.IsNullOrEmpty(node.ProbeResidual)
+            || !string.IsNullOrEmpty(node.MergeResidual) || !string.IsNullOrEmpty(node.PassThru)
+            || !string.IsNullOrEmpty(node.SetPredicate);
+        if (hasPredicates)
+        {
+            AddPropertySection("Predicates");
+            if (!string.IsNullOrEmpty(node.SeekPredicates))
+                AddPropertyRow("Seek Predicate", node.SeekPredicates, isCode: true);
+            if (!string.IsNullOrEmpty(node.Predicate))
+                AddPropertyRow("Predicate", node.Predicate, isCode: true);
+            if (!string.IsNullOrEmpty(node.HashKeysBuild))
+                AddPropertyRow("Hash Keys (Build)", node.HashKeysBuild, isCode: true);
+            if (!string.IsNullOrEmpty(node.HashKeysProbe))
+                AddPropertyRow("Hash Keys (Probe)", node.HashKeysProbe, isCode: true);
+            if (!string.IsNullOrEmpty(node.BuildResidual))
+                AddPropertyRow("Build Residual", node.BuildResidual, isCode: true);
+            if (!string.IsNullOrEmpty(node.ProbeResidual))
+                AddPropertyRow("Probe Residual", node.ProbeResidual, isCode: true);
+            if (!string.IsNullOrEmpty(node.MergeResidual))
+                AddPropertyRow("Merge Residual", node.MergeResidual, isCode: true);
+            if (!string.IsNullOrEmpty(node.PassThru))
+                AddPropertyRow("Pass Through", node.PassThru, isCode: true);
+            if (!string.IsNullOrEmpty(node.SetPredicate))
+                AddPropertyRow("Set Predicate", node.SetPredicate, isCode: true);
+        }
+
+        // === Output Columns ===
+        if (!string.IsNullOrEmpty(node.OutputColumns))
+        {
+            AddPropertySection("Output");
+            AddPropertyRow("Columns", node.OutputColumns, isCode: true);
+        }
+
+        // === Memory ===
+        if (node.MemoryGrantKB > 0 || node.DesiredMemoryKB > 0 || node.MaxUsedMemoryKB > 0
+            || node.MemoryFractionInput > 0 || node.MemoryFractionOutput > 0)
+        {
+            AddPropertySection("Memory");
+            if (node.MemoryGrantKB > 0) AddPropertyRow("Granted", $"{node.MemoryGrantKB:N0} KB");
+            if (node.DesiredMemoryKB > 0) AddPropertyRow("Desired", $"{node.DesiredMemoryKB:N0} KB");
+            if (node.MaxUsedMemoryKB > 0) AddPropertyRow("Max Used", $"{node.MaxUsedMemoryKB:N0} KB");
+            if (node.MemoryFractionInput > 0) AddPropertyRow("Fraction Input", $"{node.MemoryFractionInput:F4}");
+            if (node.MemoryFractionOutput > 0) AddPropertyRow("Fraction Output", $"{node.MemoryFractionOutput:F4}");
+        }
+
+        // === Root node only: statement-level sections ===
+        if (node.Parent == null && _currentStatement != null)
+        {
+            var s = _currentStatement;
+
+            // === Statement Text ===
+            if (!string.IsNullOrEmpty(s.StatementText))
+            {
+                AddPropertySection("Statement");
+                AddPropertyRow("Text", s.StatementText, isCode: true);
+                if (!string.IsNullOrEmpty(s.ParameterizedText) && s.ParameterizedText != s.StatementText)
+                    AddPropertyRow("Parameterized", s.ParameterizedText, isCode: true);
+            }
+
+            // === Cursor Info ===
+            if (!string.IsNullOrEmpty(s.CursorName))
+            {
+                AddPropertySection("Cursor Info");
+                AddPropertyRow("Cursor Name", s.CursorName);
+                if (!string.IsNullOrEmpty(s.CursorActualType))
+                    AddPropertyRow("Actual Type", s.CursorActualType);
+                if (!string.IsNullOrEmpty(s.CursorRequestedType))
+                    AddPropertyRow("Requested Type", s.CursorRequestedType);
+                if (!string.IsNullOrEmpty(s.CursorConcurrency))
+                    AddPropertyRow("Concurrency", s.CursorConcurrency);
+                AddPropertyRow("Forward Only", s.CursorForwardOnly ? "True" : "False");
+            }
+
+            // === Statement Memory Grant ===
+            if (s.MemoryGrant != null)
+            {
+                var mg = s.MemoryGrant;
+                AddPropertySection("Memory Grant Info");
+                AddPropertyRow("Granted", $"{mg.GrantedMemoryKB:N0} KB");
+                AddPropertyRow("Max Used", $"{mg.MaxUsedMemoryKB:N0} KB");
+                AddPropertyRow("Requested", $"{mg.RequestedMemoryKB:N0} KB");
+                AddPropertyRow("Desired", $"{mg.DesiredMemoryKB:N0} KB");
+                AddPropertyRow("Required", $"{mg.RequiredMemoryKB:N0} KB");
+                AddPropertyRow("Serial Required", $"{mg.SerialRequiredMemoryKB:N0} KB");
+                AddPropertyRow("Serial Desired", $"{mg.SerialDesiredMemoryKB:N0} KB");
+                if (mg.GrantWaitTimeMs > 0)
+                    AddPropertyRow("Grant Wait Time", $"{mg.GrantWaitTimeMs:N0} ms");
+                if (mg.LastRequestedMemoryKB > 0)
+                    AddPropertyRow("Last Requested", $"{mg.LastRequestedMemoryKB:N0} KB");
+                if (!string.IsNullOrEmpty(mg.IsMemoryGrantFeedbackAdjusted))
+                    AddPropertyRow("Feedback Adjusted", mg.IsMemoryGrantFeedbackAdjusted);
+            }
+
+            // === Statement Info ===
+            AddPropertySection("Statement Info");
+            if (!string.IsNullOrEmpty(s.StatementOptmLevel))
+                AddPropertyRow("Optimization Level", s.StatementOptmLevel);
+            if (!string.IsNullOrEmpty(s.StatementOptmEarlyAbortReason))
+                AddPropertyRow("Early Abort Reason", s.StatementOptmEarlyAbortReason);
+            if (s.CardinalityEstimationModelVersion > 0)
+                AddPropertyRow("CE Model Version", $"{s.CardinalityEstimationModelVersion}");
+            if (s.DegreeOfParallelism > 0)
+                AddPropertyRow("DOP", $"{s.DegreeOfParallelism}");
+            if (s.EffectiveDOP > 0)
+                AddPropertyRow("Effective DOP", $"{s.EffectiveDOP}");
+            if (!string.IsNullOrEmpty(s.DOPFeedbackAdjusted))
+                AddPropertyRow("DOP Feedback", s.DOPFeedbackAdjusted);
+            if (!string.IsNullOrEmpty(s.NonParallelPlanReason))
+                AddPropertyRow("Non-Parallel Reason", s.NonParallelPlanReason);
+            if (s.MaxQueryMemoryKB > 0)
+                AddPropertyRow("Max Query Memory", $"{s.MaxQueryMemoryKB:N0} KB");
+            AddPropertyRow("Compile Time", $"{s.CompileTimeMs:N0} ms");
+            AddPropertyRow("Compile CPU", $"{s.CompileCPUMs:N0} ms");
+            AddPropertyRow("Compile Memory", $"{s.CompileMemoryKB:N0} KB");
+            if (s.CachedPlanSizeKB > 0)
+                AddPropertyRow("Cached Plan Size", $"{s.CachedPlanSizeKB:N0} KB");
+            AddPropertyRow("Retrieved From Cache", s.RetrievedFromCache ? "True" : "False");
+            AddPropertyRow("Batch Mode On RowStore", s.BatchModeOnRowStoreUsed ? "True" : "False");
+            AddPropertyRow("Security Policy", s.SecurityPolicyApplied ? "True" : "False");
+            AddPropertyRow("Parameterization Type", $"{s.StatementParameterizationType}");
+            if (!string.IsNullOrEmpty(s.QueryHash))
+                AddPropertyRow("Query Hash", s.QueryHash, isCode: true);
+            if (!string.IsNullOrEmpty(s.QueryPlanHash))
+                AddPropertyRow("Plan Hash", s.QueryPlanHash, isCode: true);
+            if (!string.IsNullOrEmpty(s.StatementSqlHandle))
+                AddPropertyRow("SQL Handle", s.StatementSqlHandle, isCode: true);
+            AddPropertyRow("DB Settings Id", $"{s.DatabaseContextSettingsId}");
+            AddPropertyRow("Parent Object Id", $"{s.ParentObjectId}");
+
+            // Plan Guide
+            if (!string.IsNullOrEmpty(s.PlanGuideName))
+            {
+                AddPropertyRow("Plan Guide", s.PlanGuideName);
+                if (!string.IsNullOrEmpty(s.PlanGuideDB))
+                    AddPropertyRow("Plan Guide DB", s.PlanGuideDB);
+            }
+            if (s.UsePlan)
+                AddPropertyRow("USE PLAN", "True");
+
+            // Query Store Hints
+            if (s.QueryStoreStatementHintId > 0)
+            {
+                AddPropertyRow("QS Hint Id", $"{s.QueryStoreStatementHintId}");
+                if (!string.IsNullOrEmpty(s.QueryStoreStatementHintText))
+                    AddPropertyRow("QS Hint", s.QueryStoreStatementHintText, isCode: true);
+                if (!string.IsNullOrEmpty(s.QueryStoreStatementHintSource))
+                    AddPropertyRow("QS Hint Source", s.QueryStoreStatementHintSource);
+            }
+
+            // === Set Options ===
+            if (s.SetOptions != null)
+            {
+                var so = s.SetOptions;
+                AddPropertySection("Set Options");
+                AddPropertyRow("ANSI_NULLS", so.AnsiNulls ? "True" : "False");
+                AddPropertyRow("ANSI_PADDING", so.AnsiPadding ? "True" : "False");
+                AddPropertyRow("ANSI_WARNINGS", so.AnsiWarnings ? "True" : "False");
+                AddPropertyRow("ARITHABORT", so.ArithAbort ? "True" : "False");
+                AddPropertyRow("CONCAT_NULL", so.ConcatNullYieldsNull ? "True" : "False");
+                AddPropertyRow("NUMERIC_ROUNDABORT", so.NumericRoundAbort ? "True" : "False");
+                AddPropertyRow("QUOTED_IDENTIFIER", so.QuotedIdentifier ? "True" : "False");
+            }
+
+            // === Optimizer Hardware Properties ===
+            if (s.HardwareProperties != null)
+            {
+                var hw = s.HardwareProperties;
+                AddPropertySection("Hardware Properties");
+                AddPropertyRow("Available Memory", $"{hw.EstimatedAvailableMemoryGrant:N0} KB");
+                AddPropertyRow("Pages Cached", $"{hw.EstimatedPagesCached:N0}");
+                AddPropertyRow("Available DOP", $"{hw.EstimatedAvailableDOP}");
+                if (hw.MaxCompileMemory > 0)
+                    AddPropertyRow("Max Compile Memory", $"{hw.MaxCompileMemory:N0} KB");
+            }
+
+            // === Optimizer Stats Usage ===
+            if (s.StatsUsage.Count > 0)
+            {
+                AddPropertySection("Statistics Used");
+                foreach (var stat in s.StatsUsage)
+                {
+                    var statLabel = !string.IsNullOrEmpty(stat.TableName)
+                        ? $"{stat.TableName}.{stat.StatisticsName}"
+                        : stat.StatisticsName;
+                    var statDetail = $"Modified: {stat.ModificationCount:N0}, Sampled: {stat.SamplingPercent:F1}%";
+                    if (!string.IsNullOrEmpty(stat.LastUpdate))
+                        statDetail += $", Updated: {stat.LastUpdate}";
+                    AddPropertyRow(statLabel, statDetail);
+                }
+            }
+
+            // === Parameters ===
+            if (s.Parameters.Count > 0)
+            {
+                AddPropertySection("Parameters");
+                foreach (var p in s.Parameters)
+                {
+                    var paramText = p.DataType;
+                    if (!string.IsNullOrEmpty(p.CompiledValue))
+                        paramText += $", Compiled: {p.CompiledValue}";
+                    if (!string.IsNullOrEmpty(p.RuntimeValue))
+                        paramText += $", Runtime: {p.RuntimeValue}";
+                    AddPropertyRow(p.Name, paramText);
+                }
+            }
+
+            // === Query Time Stats (actual plans) ===
+            if (s.QueryTimeStats != null)
+            {
+                AddPropertySection("Query Time Stats");
+                AddPropertyRow("CPU Time", $"{s.QueryTimeStats.CpuTimeMs:N0} ms");
+                AddPropertyRow("Elapsed Time", $"{s.QueryTimeStats.ElapsedTimeMs:N0} ms");
+            }
+
+            // === Thread Stats (actual plans) ===
+            if (s.ThreadStats != null)
+            {
+                AddPropertySection("Thread Stats");
+                AddPropertyRow("Branches", $"{s.ThreadStats.Branches}");
+                AddPropertyRow("Used Threads", $"{s.ThreadStats.UsedThreads}");
+            }
+
+            // === Wait Stats (actual plans) ===
+            if (s.WaitStats.Count > 0)
+            {
+                AddPropertySection("Wait Stats");
+                foreach (var w in s.WaitStats)
+                    AddPropertyRow(w.WaitType, $"{w.WaitTimeMs:N0} ms ({w.WaitCount:N0} waits)");
+            }
+
+            // === Trace Flags ===
+            if (s.TraceFlags.Count > 0)
+            {
+                AddPropertySection("Trace Flags");
+                foreach (var tf in s.TraceFlags)
+                {
+                    var tfLabel = $"TF {tf.Value}";
+                    var tfDetail = $"{tf.Scope}{(tf.IsCompileTime ? ", Compile-time" : ", Runtime")}";
+                    AddPropertyRow(tfLabel, tfDetail);
+                }
+            }
+
+            // === Indexed Views ===
+            if (s.IndexedViews.Count > 0)
+            {
+                AddPropertySection("Indexed Views");
+                foreach (var iv in s.IndexedViews)
+                    AddPropertyRow("View", iv, isCode: true);
+            }
+
+            // === Plan-Level Warnings ===
+            if (s.PlanWarnings.Count > 0)
+            {
+                AddPropertySection("Plan Warnings");
+                foreach (var w in s.PlanWarnings)
+                {
+                    var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                        : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                    var warnPanel = new StackPanel { Margin = new Thickness(10, 2, 10, 2) };
+                    warnPanel.Children.Add(new TextBlock
+                    {
+                        Text = $"\u26A0 {w.WarningType}",
+                        FontWeight = FontWeights.SemiBold,
+                        FontSize = 11,
+                        Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(warnColor))
+                    });
+                    warnPanel.Children.Add(new TextBlock
+                    {
+                        Text = w.Message,
+                        FontSize = 11,
+                        Foreground = TooltipFgBrush,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Thickness(16, 0, 0, 0)
+                    });
+                    (_currentPropertySection ?? PropertiesContent).Children.Add(warnPanel);
+                }
+            }
+
+            // === Missing Indexes ===
+            if (s.MissingIndexes.Count > 0)
+            {
+                AddPropertySection("Missing Indexes");
+                foreach (var mi in s.MissingIndexes)
+                {
+                    AddPropertyRow($"{mi.Schema}.{mi.Table}", $"Impact: {mi.Impact:F1}%");
+                    if (!string.IsNullOrEmpty(mi.CreateStatement))
+                        AddPropertyRow("CREATE INDEX", mi.CreateStatement, isCode: true);
+                }
+            }
+        }
+
+        // === Warnings ===
+        if (node.HasWarnings)
+        {
+            AddPropertySection("Warnings");
+            foreach (var w in node.Warnings)
+            {
+                var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                    : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                var warnPanel = new StackPanel { Margin = new Thickness(10, 2, 10, 2) };
+                warnPanel.Children.Add(new TextBlock
+                {
+                    Text = $"\u26A0 {w.WarningType}",
+                    FontWeight = FontWeights.SemiBold,
+                    FontSize = 11,
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(warnColor))
+                });
+                warnPanel.Children.Add(new TextBlock
+                {
+                    Text = w.Message,
+                    FontSize = 11,
+                    Foreground = TooltipFgBrush,
+                    TextWrapping = TextWrapping.Wrap,
+                    Margin = new Thickness(16, 0, 0, 0)
+                });
+                PropertiesContent.Children.Add(warnPanel);
+            }
+        }
+
+        // Show the panel
+        PropertiesColumn.Width = new GridLength(320);
+        PropertiesSplitter.Visibility = Visibility.Visible;
+        PropertiesPanel.Visibility = Visibility.Visible;
+    }
+
+    private void AddPropertySection(string title)
+    {
+        var contentPanel = new StackPanel();
+        var expander = new Expander
+        {
+            IsExpanded = true,
+            Header = new TextBlock
+            {
+                Text = title,
+                FontWeight = FontWeights.SemiBold,
+                FontSize = 11,
+                Foreground = SectionHeaderBrush
+            },
+            Content = contentPanel,
+            Margin = new Thickness(0, 2, 0, 0),
+            Padding = new Thickness(0),
+            Foreground = SectionHeaderBrush,
+            Background = new SolidColorBrush(Color.FromArgb(0x18, 0x4F, 0xA3, 0xFF)),
+            BorderBrush = PropSeparatorBrush,
+            BorderThickness = new Thickness(0, 0, 0, 1)
+        };
+        PropertiesContent.Children.Add(expander);
+        _currentPropertySection = contentPanel;
+    }
+
+    private void AddPropertyRow(string label, string value, bool isCode = false)
+    {
+        var grid = new Grid { Margin = new Thickness(10, 3, 10, 3) };
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(120) });
+        grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+
+        var labelBlock = new TextBlock
+        {
+            Text = label,
+            FontSize = 11,
+            Foreground = MutedBrush,
+            VerticalAlignment = VerticalAlignment.Top
+        };
+        Grid.SetColumn(labelBlock, 0);
+        grid.Children.Add(labelBlock);
+
+        var valueBlock = new TextBlock
+        {
+            Text = value,
+            FontSize = 11,
+            Foreground = TooltipFgBrush,
+            TextWrapping = TextWrapping.Wrap
+        };
+        if (isCode) valueBlock.FontFamily = new FontFamily("Consolas");
+        Grid.SetColumn(valueBlock, 1);
+        grid.Children.Add(valueBlock);
+
+        var target = _currentPropertySection ?? PropertiesContent;
+        target.Children.Add(grid);
+    }
+
+    private void CloseProperties_Click(object sender, RoutedEventArgs e)
+    {
+        ClosePropertiesPanel();
+    }
+
+    private void ClosePropertiesPanel()
+    {
+        PropertiesPanel.Visibility = Visibility.Collapsed;
+        PropertiesSplitter.Visibility = Visibility.Collapsed;
+        PropertiesColumn.Width = new GridLength(0);
+
+        // Deselect node
+        if (_selectedNodeBorder != null)
+        {
+            _selectedNodeBorder.BorderBrush = _selectedNodeOriginalBorder;
+            _selectedNodeBorder.BorderThickness = _selectedNodeOriginalThickness;
+            _selectedNodeBorder = null;
+        }
+    }
+
+    #endregion
+
+    #region Tooltips
+
+    private ToolTip BuildNodeTooltip(PlanNode node)
+    {
+        var tip = new ToolTip
+        {
+            Background = TooltipBgBrush,
+            BorderBrush = TooltipBorderBrush,
+            Foreground = TooltipFgBrush,
+            Padding = new Thickness(12),
+            MaxWidth = 500
+        };
+
+        var stack = new StackPanel();
+
+        // Header
+        var headerText = node.PhysicalOp;
+        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp))
+            headerText += $" ({node.LogicalOp})";
+        stack.Children.Add(new TextBlock
+        {
+            Text = headerText,
+            FontWeight = FontWeights.Bold,
+            FontSize = 13,
+            Margin = new Thickness(0, 0, 0, 8)
+        });
+
+        // Cost
+        AddTooltipSection(stack, "Costs");
+        AddTooltipRow(stack, "Cost", $"{node.CostPercent}% of statement ({node.EstimatedOperatorCost:F6})");
+        AddTooltipRow(stack, "Subtree Cost", $"{node.EstimatedTotalSubtreeCost:F6}");
+
+        // Rows
+        AddTooltipSection(stack, "Rows");
+        AddTooltipRow(stack, "Estimated Rows", $"{node.EstimateRows:N1}");
+        if (node.HasActualStats)
+        {
+            AddTooltipRow(stack, "Actual Rows", $"{node.ActualRows:N0}");
+            if (node.ActualRowsRead > 0)
+                AddTooltipRow(stack, "Actual Rows Read", $"{node.ActualRowsRead:N0}");
+            AddTooltipRow(stack, "Actual Executions", $"{node.ActualExecutions:N0}");
+        }
+
+        // I/O and CPU estimates
+        if (node.EstimateIO > 0 || node.EstimateCPU > 0 || node.EstimatedRowSize > 0)
+        {
+            AddTooltipSection(stack, "Estimates");
+            if (node.EstimateIO > 0) AddTooltipRow(stack, "I/O Cost", $"{node.EstimateIO:F6}");
+            if (node.EstimateCPU > 0) AddTooltipRow(stack, "CPU Cost", $"{node.EstimateCPU:F6}");
+            if (node.EstimatedRowSize > 0) AddTooltipRow(stack, "Avg Row Size", $"{node.EstimatedRowSize} B");
+        }
+
+        // Actual I/O
+        if (node.HasActualStats && (node.ActualLogicalReads > 0 || node.ActualPhysicalReads > 0))
+        {
+            AddTooltipSection(stack, "Actual I/O");
+            AddTooltipRow(stack, "Logical Reads", $"{node.ActualLogicalReads:N0}");
+            if (node.ActualPhysicalReads > 0)
+                AddTooltipRow(stack, "Physical Reads", $"{node.ActualPhysicalReads:N0}");
+            if (node.ActualScans > 0)
+                AddTooltipRow(stack, "Scans", $"{node.ActualScans:N0}");
+            if (node.ActualReadAheads > 0)
+                AddTooltipRow(stack, "Read-Aheads", $"{node.ActualReadAheads:N0}");
+        }
+
+        // Actual timing
+        if (node.HasActualStats && (node.ActualElapsedMs > 0 || node.ActualCPUMs > 0))
+        {
+            AddTooltipSection(stack, "Timing");
+            if (node.ActualElapsedMs > 0)
+                AddTooltipRow(stack, "Elapsed Time", $"{node.ActualElapsedMs:N0} ms");
+            if (node.ActualCPUMs > 0)
+                AddTooltipRow(stack, "CPU Time", $"{node.ActualCPUMs:N0} ms");
+        }
+
+        // Parallelism
+        if (node.Parallel || !string.IsNullOrEmpty(node.ExecutionMode) || !string.IsNullOrEmpty(node.PartitioningType))
+        {
+            AddTooltipSection(stack, "Parallelism");
+            if (node.Parallel) AddTooltipRow(stack, "Parallel", "Yes");
+            if (!string.IsNullOrEmpty(node.ExecutionMode))
+                AddTooltipRow(stack, "Execution Mode", node.ExecutionMode);
+            if (!string.IsNullOrEmpty(node.ActualExecutionMode) && node.ActualExecutionMode != node.ExecutionMode)
+                AddTooltipRow(stack, "Actual Exec Mode", node.ActualExecutionMode);
+            if (!string.IsNullOrEmpty(node.PartitioningType))
+                AddTooltipRow(stack, "Partitioning", node.PartitioningType);
+        }
+
+        // Object — show full qualified name
+        if (!string.IsNullOrEmpty(node.FullObjectName))
+        {
+            AddTooltipSection(stack, "Object");
+            AddTooltipRow(stack, "Name", node.FullObjectName, isCode: true);
+            if (node.Ordered) AddTooltipRow(stack, "Ordered", "True");
+            if (!string.IsNullOrEmpty(node.ScanDirection))
+                AddTooltipRow(stack, "Scan Direction", node.ScanDirection);
+        }
+        else if (!string.IsNullOrEmpty(node.ObjectName))
+        {
+            AddTooltipSection(stack, "Object");
+            AddTooltipRow(stack, "Name", node.ObjectName, isCode: true);
+            if (node.Ordered) AddTooltipRow(stack, "Ordered", "True");
+            if (!string.IsNullOrEmpty(node.ScanDirection))
+                AddTooltipRow(stack, "Scan Direction", node.ScanDirection);
+        }
+
+        // Operator details (key items only in tooltip)
+        var hasTooltipDetails = !string.IsNullOrEmpty(node.OrderBy)
+            || !string.IsNullOrEmpty(node.TopExpression)
+            || !string.IsNullOrEmpty(node.GroupBy)
+            || !string.IsNullOrEmpty(node.OuterReferences);
+        if (hasTooltipDetails)
+        {
+            AddTooltipSection(stack, "Details");
+            if (!string.IsNullOrEmpty(node.OrderBy))
+                AddTooltipRow(stack, "Order By", node.OrderBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.TopExpression))
+                AddTooltipRow(stack, "Top", node.IsPercent ? $"{node.TopExpression} PERCENT" : node.TopExpression);
+            if (!string.IsNullOrEmpty(node.GroupBy))
+                AddTooltipRow(stack, "Group By", node.GroupBy, isCode: true);
+            if (!string.IsNullOrEmpty(node.OuterReferences))
+                AddTooltipRow(stack, "Outer References", node.OuterReferences, isCode: true);
+        }
+
+        // Predicates
+        if (!string.IsNullOrEmpty(node.SeekPredicates) || !string.IsNullOrEmpty(node.Predicate))
+        {
+            AddTooltipSection(stack, "Predicates");
+            if (!string.IsNullOrEmpty(node.SeekPredicates))
+                AddTooltipRow(stack, "Seek", node.SeekPredicates, isCode: true);
+            if (!string.IsNullOrEmpty(node.Predicate))
+                AddTooltipRow(stack, "Residual", node.Predicate, isCode: true);
+        }
+
+        // Output columns
+        if (!string.IsNullOrEmpty(node.OutputColumns))
+        {
+            AddTooltipSection(stack, "Output");
+            AddTooltipRow(stack, "Columns", node.OutputColumns, isCode: true);
+        }
+
+        // Warnings
+        if (node.HasWarnings)
+        {
+            stack.Children.Add(new Separator { Margin = new Thickness(0, 6, 0, 6) });
+            foreach (var w in node.Warnings)
+            {
+                var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                    : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                stack.Children.Add(new TextBlock
+                {
+                    Text = $"\u26A0 {w.WarningType}: {w.Message}",
+                    Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString(warnColor)),
+                    FontSize = 11,
+                    TextWrapping = TextWrapping.Wrap,
+                    Margin = new Thickness(0, 2, 0, 0)
+                });
+            }
+        }
+
+        // Footer hint
+        stack.Children.Add(new TextBlock
+        {
+            Text = "Click to view full properties",
+            FontSize = 10,
+            FontStyle = FontStyles.Italic,
+            Foreground = MutedBrush,
+            Margin = new Thickness(0, 8, 0, 0)
+        });
+
+        tip.Content = stack;
+        return tip;
+    }
+
+    private static void AddTooltipSection(StackPanel parent, string title)
+    {
+        parent.Children.Add(new TextBlock
+        {
+            Text = title,
+            FontSize = 10,
+            FontWeight = FontWeights.SemiBold,
+            Foreground = SectionHeaderBrush,
+            Margin = new Thickness(0, 6, 0, 2)
+        });
+    }
+
+    private static void AddTooltipRow(StackPanel parent, string label, string value, bool isCode = false)
+    {
+        var row = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 1, 0, 1) };
+        row.Children.Add(new TextBlock
+        {
+            Text = $"{label}: ",
+            Foreground = MutedBrush,
+            FontSize = 11,
+            MinWidth = 120
+        });
+        var valueBlock = new TextBlock
+        {
+            Text = value,
+            FontSize = 11,
+            TextWrapping = TextWrapping.Wrap,
+            MaxWidth = 350
+        };
+        if (isCode) valueBlock.FontFamily = new FontFamily("Consolas");
+        row.Children.Add(valueBlock);
+        parent.Children.Add(row);
+    }
+
+    #endregion
+
+    #region Banners
+
+    private void ShowMissingIndexes(List<MissingIndex> indexes)
+    {
+        if (indexes.Count > 0)
+        {
+            MissingIndexList.ItemsSource = indexes;
+            MissingIndexBanner.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            MissingIndexBanner.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private void ShowWarnings(PlanNode root)
+    {
+        var allWarnings = new List<PlanWarning>();
+        CollectWarnings(root, allWarnings);
+
+        if (allWarnings.Count > 0)
+        {
+            var criticalCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Critical);
+            var warningCount = allWarnings.Count(w => w.Severity == PlanWarningSeverity.Warning);
+            var parts = new List<string>();
+            if (criticalCount > 0) parts.Add($"{criticalCount} critical");
+            if (warningCount > 0) parts.Add($"{warningCount} warning(s)");
+            WarningsSummaryText.Text = $"Plan has {string.Join(", ", parts)} — hover over nodes with \u26A0 for details";
+            WarningsBanner.Visibility = Visibility.Visible;
+        }
+        else
+        {
+            WarningsBanner.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
+    {
+        warnings.AddRange(node.Warnings);
+        foreach (var child in node.Children)
+            CollectWarnings(child, warnings);
+    }
+
+    #endregion
+
+    #region Zoom
+
+    private void ZoomIn_Click(object sender, RoutedEventArgs e) => SetZoom(_zoomLevel + ZoomStep);
+    private void ZoomOut_Click(object sender, RoutedEventArgs e) => SetZoom(_zoomLevel - ZoomStep);
+
+    private void ZoomFit_Click(object sender, RoutedEventArgs e)
+    {
+        if (PlanCanvas.Width <= 0 || PlanCanvas.Height <= 0) return;
+
+        var viewWidth = PlanScrollViewer.ActualWidth;
+        var viewHeight = PlanScrollViewer.ActualHeight;
+        if (viewWidth <= 0 || viewHeight <= 0) return;
+
+        var fitZoom = Math.Min(viewWidth / PlanCanvas.Width, viewHeight / PlanCanvas.Height);
+        SetZoom(Math.Min(fitZoom, 1.0));
+    }
+
+    private void SetZoom(double level)
+    {
+        _zoomLevel = Math.Max(MinZoom, Math.Min(MaxZoom, level));
+        ZoomTransform.ScaleX = _zoomLevel;
+        ZoomTransform.ScaleY = _zoomLevel;
+        ZoomLevelText.Text = $"{(int)(_zoomLevel * 100)}%";
+    }
+
+    private void PlanScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+    {
+        if (Keyboard.Modifiers == ModifierKeys.Control)
+        {
+            e.Handled = true;
+            SetZoom(_zoomLevel + (e.Delta > 0 ? ZoomStep : -ZoomStep));
+        }
+    }
+
+    #endregion
+
+    #region Save & Statement Selection
+
+    private void SavePlan_Click(object sender, RoutedEventArgs e)
+    {
+        if (_currentPlan == null || string.IsNullOrEmpty(_currentPlan.RawXml)) return;
+
+        var dialog = new SaveFileDialog
+        {
+            Filter = "SQL Plan Files (*.sqlplan)|*.sqlplan|XML Files (*.xml)|*.xml|All Files (*.*)|*.*",
+            DefaultExt = ".sqlplan",
+            FileName = $"plan_{DateTime.Now:yyyyMMdd_HHmmss}.sqlplan"
+        };
+
+        if (dialog.ShowDialog() == true)
+        {
+            File.WriteAllText(dialog.FileName, _currentPlan.RawXml);
+        }
+    }
+
+    private void StatementSelector_Changed(object sender, SelectionChangedEventArgs e)
+    {
+        if (StatementSelector.SelectedItem is ComboBoxItem item && item.Tag is int index)
+        {
+            var allStatements = _currentPlan?.Batches
+                .SelectMany(b => b.Statements)
+                .Where(s => s.RootNode != null)
+                .ToList();
+
+            if (allStatements != null && index >= 0 && index < allStatements.Count)
+                RenderStatement(allStatements[index]);
+        }
+    }
+
+    #endregion
+}
diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 41110533..d921112a 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -1,7 +1,8 @@
 <UserControl x:Class="PerformanceMonitorLite.Controls.ServerTab"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF">
+             xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
+             xmlns:controls="clr-namespace:PerformanceMonitorLite.Controls">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -16,6 +17,9 @@
                 <MenuItem Header="Copy Repro Script" Click="CopyReproScript_Click"/>
                 <Separator/>
                 <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+                <Separator/>
+                <MenuItem Header="View Plan" Click="ViewEstimatedPlan_Click"/>
+                <MenuItem Header="Get Actual Plan" Click="GetActualPlan_Click"/>
             </ContextMenu>
 
             <Style x:Key="GridRowStyle" TargetType="DataGridRow">
@@ -196,14 +200,21 @@
                                     <RowDefinition Height="Auto"/>
                                     <RowDefinition Height="*"/>
                                 </Grid.RowDefinitions>
-                                <TextBlock Grid.Row="0" Text="Currently Running Queries" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,8"/>
+                                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,8">
+                                    <TextBlock Text="Currently Running Queries" FontSize="14" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                                    <Button x:Name="LiveSnapshotButton" Content="Live Snapshot"
+                                            Click="LiveSnapshot_Click" Padding="12,4" Margin="16,0,8,0"
+                                            VerticalAlignment="Center"/>
+                                    <TextBlock x:Name="LiveSnapshotIndicator" Text="" FontSize="12"
+                                               Foreground="DarkGoldenrod" FontWeight="SemiBold" VerticalAlignment="Center"/>
+                                </StackPanel>
                                 <DataGrid Grid.Row="1" x:Name="QuerySnapshotsGrid"
                                           AutoGenerateColumns="False" IsReadOnly="True"
                                           RowStyle="{StaticResource GridRowStyle}"
                                           HeadersVisibility="Column" GridLinesVisibility="Horizontal"
                                           CanUserSortColumns="True">
                                     <DataGrid.Columns>
-                                        <DataGridTextColumn Binding="{Binding SessionId}" Width="55">
+                                        <DataGridTextColumn Binding="{Binding SessionId}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SessionId" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="SPID" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding CollectionTimeLocal}" Width="140">
@@ -212,48 +223,63 @@
                                         <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding LoginName}" Width="110">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LoginName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Login" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding HostName}" Width="110">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HostName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Host" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding ProgramName}" Width="140">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ProgramName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Program" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding Status}" Width="80">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Status" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding ElapsedTimeFormatted}" Width="120">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ElapsedTimeFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Elapsed" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding CpuTimeMs, StringFormat=N0}" Width="80">
+                                        <DataGridTextColumn Binding="{Binding CpuTimeMs, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CpuTimeMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding LogicalReads, StringFormat=N0}" Width="95">
+                                        <DataGridTextColumn Binding="{Binding LogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="95">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LogicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" Width="70">
+                                        <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Reads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" Width="70">
+                                        <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Writes" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Writes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding WaitType}" Width="120">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitType" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Wait Type" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding WaitTimeMs, StringFormat=N0}" Width="80">
+                                        <DataGridTextColumn Binding="{Binding WaitTimeMs, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitTimeMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Wait (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding WaitResource}" Width="140">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="WaitResource" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Wait Resource" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding BlockingSessionId}" Width="70">
+                                        <DataGridTextColumn Binding="{Binding BlockingSessionId}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockingSessionId" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocking" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding Dop}" Width="45">
+                                        <DataGridTextColumn Binding="{Binding Dop}" ElementStyle="{StaticResource NumericCell}" Width="45">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Dop" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="DOP" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding ParallelWorkerCount}" Width="60">
+                                        <DataGridTextColumn Binding="{Binding ParallelWorkerCount}" ElementStyle="{StaticResource NumericCell}" Width="60">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ParallelWorkerCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Workers" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding GrantedQueryMemoryGb, StringFormat=F2}" Width="90">
+                                        <DataGridTextColumn Binding="{Binding GrantedQueryMemoryGb, StringFormat=F2}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="GrantedQueryMemoryGb" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Memory (GB)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding TransactionIsolationLevel}" Width="140">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TransactionIsolationLevel" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Isolation" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding OpenTransactionCount}" ElementStyle="{StaticResource NumericCell}" Width="70">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OpenTransactionCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Open Tran" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
+                                        <DataGridTextColumn Binding="{Binding PercentComplete, StringFormat=F1}" ElementStyle="{StaticResource NumericCell}" Width="70">
+                                            <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PercentComplete" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="% Done" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                        </DataGridTextColumn>
                                         <DataGridTemplateColumn Width="500">
                                             <DataGridTemplateColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTemplateColumn.Header>
                                                                                         <DataGridTemplateColumn.CellTemplate>
@@ -294,55 +320,79 @@
                                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalExecutions, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding TotalExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalExecutions" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Executions" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalCpuMs, StringFormat=N1}" Width="110">
+                                    <DataGridTextColumn Binding="{Binding TotalCpuMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgCpuMs, StringFormat=N2}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding AvgCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalElapsedMs, StringFormat=N1}" Width="130">
+                                    <DataGridTextColumn Binding="{Binding TotalElapsedMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="130">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgElapsedMs, StringFormat=N2}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding AvgElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgReads, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding AvgReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Writes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="110">
+                                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalRows, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding TotalRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRows" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Rows" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding MinCpuMs, StringFormat=N2}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding MinCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding MaxCpuMs, StringFormat=N2}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding MaxCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding MinElapsedMs, StringFormat=N2}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding MinElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding MaxElapsedMs, StringFormat=N2}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding MaxElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Phys Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Phys Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRows" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Rows" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRows" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Rows" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinGrantKb, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinGrantKb" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Grant KB" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxGrantKb, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxGrantKb" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Grant KB" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min DOP" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding MaxDop}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding MaxDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max DOP" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding QueryHash}" Width="140">
@@ -351,6 +401,12 @@
                                     <DataGridTextColumn Binding="{Binding QueryPlanHash}" Width="140">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryPlanHash" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan Hash" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding SqlHandle}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SqlHandle" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="SQL Handle" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding PlanHandle}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanHandle" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan Handle" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                     <DataGridTemplateColumn Width="500">
                                         <DataGridTemplateColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTemplateColumn.Header>
                                                                                 <DataGridTemplateColumn.CellTemplate>
@@ -389,33 +445,87 @@
                                     <DataGridTextColumn Binding="{Binding ObjectType}" Width="80">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ObjectType" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Type" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalExecutions, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding TotalExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalExecutions" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Executions" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalCpuMs, StringFormat=N1}" Width="110">
+                                    <DataGridTextColumn Binding="{Binding TotalCpuMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgCpuMs, StringFormat=N2}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding AvgCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalElapsedMs, StringFormat=N1}" Width="130">
+                                    <DataGridTextColumn Binding="{Binding TotalElapsedMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="130">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgElapsedMs, StringFormat=N2}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding AvgElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgReads, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding AvgReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Writes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="110">
+                                    <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Phys Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Phys Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalWrites" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Writes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalWrites" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Writes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding CachedTimeFormatted}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CachedTimeFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Cached Time" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding PlanHandle}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanHandle" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan Handle" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
+                                        <DataGridTemplateColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <Button Content="Download" Click="DownloadProcedurePlan_Click"
+                                                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                        Padding="8,4"/>
+                                            </DataTemplate>
+                                        </DataGridTemplateColumn.CellTemplate>
+                                    </DataGridTemplateColumn>
                                 </DataGrid.Columns>
                             </DataGrid>
                         </TabItem>
@@ -430,45 +540,90 @@
                                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding QueryId}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding QueryId}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryId" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query ID" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding PlanId}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding PlanId}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanId" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan ID" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalExecutions, StringFormat=N0}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding TotalExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalExecutions" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Executions" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalDurationMs, StringFormat=N1}" Width="130">
+                                    <DataGridTextColumn Binding="{Binding TotalDurationMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="130">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalDurationMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat=N2}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalCpuMs, StringFormat=N1}" Width="110">
+                                    <DataGridTextColumn Binding="{Binding TotalCpuMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuTimeMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N1}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N1}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Writes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N1}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding AvgRowcount, StringFormat=N1}" Width="90">
+                                    <DataGridTextColumn Binding="{Binding AvgRowcount, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRowcount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Rows" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding LastExecutionTimeLocal}" Width="130">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTimeLocal" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Last Execution" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min DOP" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxDop}" ElementStyle="{StaticResource NumericCell}" Width="70">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max DOP" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding ModuleName}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ModuleName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Module" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding QueryHash}" Width="140">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryHash" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query Hash" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding QueryPlanHash}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryPlanHash" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan Hash" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridCheckBoxColumn Binding="{Binding IsForcedPlan, Mode=OneWay}" Width="80" IsReadOnly="True">
+                                        <DataGridCheckBoxColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IsForcedPlan" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Forced" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridCheckBoxColumn.Header>
+                                    </DataGridCheckBoxColumn>
+                                    <DataGridTextColumn Binding="{Binding PlanForcingType}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanForcingType" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Force Type" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding ExecutionTypeDesc}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionTypeDesc" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Exec Type" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding FirstExecutionTimeLocal}" Width="130">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FirstExecutionTimeLocal" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="First Execution" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AvgClrTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgClrTimeMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg CLR (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AvgTempdbSpaceUsed, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgTempdbSpaceUsed" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg TempDB Pages" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AvgLogBytesUsed, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogBytesUsed" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Avg Log Bytes" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding PlanType}" Width="90">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanType" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan Type" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding ForceFailureCount}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ForceFailureCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Force Failures" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding LastForceFailureReason}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastForceFailureReason" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Force Failure Reason" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding CompatibilityLevel}" ElementStyle="{StaticResource NumericCell}" Width="80">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CompatibilityLevel" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Compat" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                     <DataGridTemplateColumn Width="500">
                                         <DataGridTemplateColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryText" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query Text" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTemplateColumn.Header>
                                                                                 <DataGridTemplateColumn.CellTemplate>
@@ -485,6 +640,31 @@
                 </Grid>
             </TabItem>
 
+            <!-- Plan Viewer Tab -->
+            <TabItem Header="Plan Viewer" x:Name="PlanViewerTabItem">
+                <Grid>
+                    <StackPanel x:Name="PlanEmptyState" HorizontalAlignment="Center"
+                                VerticalAlignment="Center">
+                        <TextBlock Text="No Plan Loaded" FontSize="20" FontWeight="Light"
+                                   Foreground="{DynamicResource ForegroundMutedBrush}" HorizontalAlignment="Center"/>
+                        <TextBlock Text="Right-click a query row and choose 'View Plan' or 'Get Actual Plan'"
+                                   FontSize="13" Foreground="{DynamicResource ForegroundMutedBrush}"
+                                   HorizontalAlignment="Center" Margin="0,8,0,0"/>
+                    </StackPanel>
+                    <StackPanel x:Name="PlanLoadingState" HorizontalAlignment="Center"
+                                VerticalAlignment="Center" Visibility="Collapsed">
+                        <ProgressBar IsIndeterminate="True" Width="200" Height="4" Margin="0,0,0,12"/>
+                        <TextBlock x:Name="PlanLoadingLabel" Text="Executing query for actual plan..."
+                                   FontSize="14" Foreground="{DynamicResource ForegroundMutedBrush}"
+                                   HorizontalAlignment="Center"/>
+                        <Button x:Name="CancelPlanButton" Content="Cancel" Click="CancelPlanButton_Click"
+                                HorizontalAlignment="Center" Margin="0,12,0,0" Padding="16,4"/>
+                    </StackPanel>
+                    <TabControl x:Name="PlanTabControl" Visibility="Collapsed"
+                                Background="Transparent"/>
+                </Grid>
+            </TabItem>
+
             <!-- CPU Tab -->
             <TabItem Header="CPU">
                 <Grid Margin="8">
@@ -526,10 +706,26 @@
                                         <TextBlock Text="Plan Cache" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="PlanCacheText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
+                                    <StackPanel Margin="0,0,24,0">
+                                        <TextBlock Text="Available Physical" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock x:Name="AvailablePhysicalMemoryText" Text="--" FontSize="18" FontWeight="SemiBold"/>
+                                    </StackPanel>
+                                    <StackPanel Margin="0,0,24,0">
+                                        <TextBlock Text="Total Page File" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock x:Name="TotalPageFileText" Text="--" FontSize="18" FontWeight="SemiBold"/>
+                                    </StackPanel>
+                                    <StackPanel Margin="0,0,24,0">
+                                        <TextBlock Text="Available Page File" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock x:Name="AvailablePageFileText" Text="--" FontSize="18" FontWeight="SemiBold"/>
+                                    </StackPanel>
                                     <StackPanel Margin="0,0,24,0">
                                         <TextBlock Text="System Memory State" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
                                         <TextBlock x:Name="MemoryStateText" Text="--" FontSize="18" FontWeight="SemiBold"/>
                                     </StackPanel>
+                                    <StackPanel Margin="0,0,24,0">
+                                        <TextBlock Text="Memory Model" Foreground="{StaticResource ForegroundDimBrush}" FontSize="11"/>
+                                        <TextBlock x:Name="SqlMemoryModelText" Text="--" FontSize="18" FontWeight="SemiBold"/>
+                                    </StackPanel>
                                 </WrapPanel>
                             </Border>
 
@@ -538,24 +734,115 @@
                         </Grid>
                     </TabItem>
 
+                    <!-- Memory Clerks Sub-Tab -->
+                    <TabItem Header="Memory Clerks">
+                        <Grid Margin="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="220"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+
+                            <!-- Clerk Type Picker -->
+                            <Border Grid.Column="0" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="8" Margin="0,0,4,0">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Grid.Row="0" Text="Select Memory Clerks" FontWeight="SemiBold" Margin="0,0,0,4"/>
+                                    <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,4">
+                                        <Button Content="Top Clerks" Click="MemoryClerkSelectTop_Click" Padding="6,2" Margin="0,0,4,0" FontSize="11"/>
+                                        <Button Content="Clear All" Click="MemoryClerkClearAll_Click" Padding="6,2" FontSize="11"/>
+                                        <TextBlock x:Name="MemoryClerkCountText" Text="0 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                                    </StackPanel>
+                                    <TextBox Grid.Row="2" x:Name="MemoryClerkSearchBox" TextChanged="MemoryClerkSearch_TextChanged"
+                                             Margin="0,0,0,4" Padding="4,2"/>
+                                    <ListBox Grid.Row="3" x:Name="MemoryClerksList" Background="Transparent" BorderThickness="0">
+                                        <ListBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
+                                                          Checked="MemoryClerk_CheckChanged" Unchecked="MemoryClerk_CheckChanged"
+                                                          Foreground="{StaticResource ForegroundBrush}" FontSize="11">
+                                                    <TextBlock Text="{Binding DisplayName}"/>
+                                                </CheckBox>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+                                </Grid>
+                            </Border>
+
+                            <!-- Chart + Summary -->
+                            <Grid Grid.Column="1">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <ScottPlot:WpfPlot Grid.Row="0" x:Name="MemoryClerksChart"/>
+                                <Border Grid.Row="1" Background="{StaticResource BackgroundDarkBrush}" CornerRadius="4" Padding="12,8" Margin="0,8,0,0">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <TextBlock Text="Non-BP Total:" FontWeight="SemiBold" Foreground="{StaticResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                        <TextBlock x:Name="MemoryClerksTotalText" Text="--" VerticalAlignment="Center" Margin="0,0,20,0"/>
+                                        <TextBlock Text="Top Non-BP Clerk:" FontWeight="SemiBold" Foreground="{StaticResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                        <TextBlock x:Name="MemoryClerksTopText" Text="--" VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+                        </Grid>
+                    </TabItem>
+
+                    <!-- Memory Grants Sub-Tab -->
+                    <TabItem Header="Memory Grants">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <ScottPlot:WpfPlot Grid.Row="0" x:Name="MemoryGrantSizingChart" Margin="5,5,5,2"/>
+                            <ScottPlot:WpfPlot Grid.Row="1" x:Name="MemoryGrantActivityChart" Margin="5,2,5,5"/>
+                        </Grid>
+                    </TabItem>
+
                 </TabControl>
             </TabItem>
 
             <!-- File I/O Tab -->
             <TabItem Header="File I/O">
                 <Grid Margin="8">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-
-                    <Border Grid.Row="0" Margin="0,0,0,4">
-                        <ScottPlot:WpfPlot x:Name="FileIoReadChart"/>
-                    </Border>
+                    <TabControl Background="Transparent" BorderThickness="0">
+                        <!-- File I/O Latency sub-tab -->
+                        <TabItem Header="File I/O Latency">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" Margin="0,0,0,4">
+                                    <ScottPlot:WpfPlot x:Name="FileIoReadChart"/>
+                                </Border>
+                                <Border Grid.Row="1" Margin="0,4,0,0">
+                                    <ScottPlot:WpfPlot x:Name="FileIoWriteChart"/>
+                                </Border>
+                            </Grid>
+                        </TabItem>
 
-                    <Border Grid.Row="1" Margin="0,4,0,0">
-                        <ScottPlot:WpfPlot x:Name="FileIoWriteChart"/>
-                    </Border>
+                        <!-- File I/O Throughput sub-tab -->
+                        <TabItem Header="File I/O Throughput">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" Margin="0,0,0,4">
+                                    <ScottPlot:WpfPlot x:Name="FileIoReadThroughputChart"/>
+                                </Border>
+                                <Border Grid.Row="1" Margin="0,4,0,0">
+                                    <ScottPlot:WpfPlot x:Name="FileIoWriteThroughputChart"/>
+                                </Border>
+                            </Grid>
+                        </TabItem>
+                    </TabControl>
                 </Grid>
             </TabItem>
 
@@ -586,15 +873,33 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*"/>
                                     <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
                                 </Grid.RowDefinitions>
                                 <Border Grid.Row="0" Margin="0,0,0,4">
+                                    <ScottPlot:WpfPlot x:Name="LockWaitTrendChart"/>
+                                </Border>
+                                <Border Grid.Row="1" Margin="0,4,0,4">
                                     <ScottPlot:WpfPlot x:Name="BlockingTrendChart"/>
                                 </Border>
-                                <Border Grid.Row="1" Margin="0,4,0,0">
+                                <Border Grid.Row="2" Margin="0,4,0,0">
                                     <ScottPlot:WpfPlot x:Name="DeadlockTrendChart"/>
                                 </Border>
                             </Grid>
                         </TabItem>
+                        <TabItem Header="Current Waits">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Border Grid.Row="0" Margin="0,0,0,4">
+                                    <ScottPlot:WpfPlot x:Name="CurrentWaitsDurationChart"/>
+                                </Border>
+                                <Border Grid.Row="1" Margin="0,4,0,0">
+                                    <ScottPlot:WpfPlot x:Name="CurrentWaitsBlockedChart"/>
+                                </Border>
+                            </Grid>
+                        </TabItem>
                         <TabItem Header="Blocked Process Reports">
                             <DataGrid x:Name="BlockedProcessReportGrid"
                                       AutoGenerateColumns="False" IsReadOnly="True"
@@ -608,10 +913,10 @@
                                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding BlockedSpid}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding BlockedSpid}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockedSpid" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocked SPID" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding BlockingSpid}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding BlockingSpid}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockingSpid" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocking SPID" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding WaitTimeFormatted}" Width="80">
@@ -638,13 +943,13 @@
                                     <DataGridTextColumn Binding="{Binding BlockedTransactionName}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockedTransactionName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocked Tran" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding BlockedPriority}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding BlockedPriority}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockedPriority" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocked Priority" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding BlockedTransactionCount}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding BlockedTransactionCount}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockedTransactionCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocked Tran Count" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding BlockedLogUsed}" Width="70">
+                                    <DataGridTextColumn Binding="{Binding BlockedLogUsed}" ElementStyle="{StaticResource NumericCell}" Width="70">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BlockedLogUsed" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Blocked Log Used" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding BlockedLoginName}" Width="100">
@@ -710,7 +1015,7 @@
                                     <DataGridTextColumn Binding="{Binding VictimDisplay}" Width="55">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="VictimDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Victim" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Spid}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding Spid}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Spid" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="SPID" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="120">
@@ -743,10 +1048,10 @@
                                     <DataGridTextColumn Binding="{Binding TransactionName}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TransactionName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Tran Name" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TransactionCount}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding TransactionCount}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TransactionCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Tran Count" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Priority}" Width="55">
+                                    <DataGridTextColumn Binding="{Binding Priority}" ElementStyle="{StaticResource NumericCell}" Width="55">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Priority" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Priority" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding LoginName}" Width="100">
@@ -796,16 +1101,20 @@
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
                             <TextBlock Grid.Row="0" Text="Select Counters" FontWeight="SemiBold" Margin="0,0,0,4"/>
-                            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,4">
+                            <ComboBox Grid.Row="1" x:Name="PerfmonPackCombo"
+                                      SelectionChanged="PerfmonPack_SelectionChanged"
+                                      Margin="0,0,0,4" FontSize="11"/>
+                            <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0,0,0,4">
                                 <Button Content="Select All" Click="PerfmonSelectAll_Click" Padding="6,2" Margin="0,0,4,0" FontSize="11"/>
                                 <Button Content="Clear All" Click="PerfmonClearAll_Click" Padding="6,2" FontSize="11"/>
                             </StackPanel>
-                            <TextBox Grid.Row="2" x:Name="PerfmonSearchBox" TextChanged="PerfmonSearch_TextChanged"
+                            <TextBox Grid.Row="3" x:Name="PerfmonSearchBox" TextChanged="PerfmonSearch_TextChanged"
                                      Margin="0,0,0,4" Padding="4,2"/>
-                            <ListBox Grid.Row="3" x:Name="PerfmonCountersList" Background="Transparent" BorderThickness="0">
+                            <ListBox Grid.Row="4" x:Name="PerfmonCountersList" Background="Transparent" BorderThickness="0">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}"
@@ -866,7 +1175,7 @@
                             <DataGridTextColumn Binding="{Binding RunningLongDisplay}" Width="90">
                                 <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RunningLongDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Running Long" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                             </DataGridTextColumn>
-                            <DataGridTextColumn Binding="{Binding SuccessfulRunCount}" Width="140">
+                            <DataGridTextColumn Binding="{Binding SuccessfulRunCount}" ElementStyle="{StaticResource NumericCell}" Width="140">
                                 <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SuccessfulRunCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Successful Runs (30d)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                             </DataGridTextColumn>
                         </DataGrid.Columns>
@@ -914,7 +1223,7 @@
                                     <DataGridTextColumn Binding="{Binding StateDesc}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="StateDesc" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="State" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding CompatibilityLevel}" Width="100">
+                                    <DataGridTextColumn Binding="{Binding CompatibilityLevel}" ElementStyle="{StaticResource NumericCell}" Width="100">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CompatibilityLevel" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Compat Level" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding CollationName}" Width="180">
@@ -977,7 +1286,7 @@
                                     <DataGridTextColumn Binding="{Binding PageVerifyOption}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PageVerifyOption" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Page Verify" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TargetRecoveryTimeSeconds}" Width="135">
+                                    <DataGridTextColumn Binding="{Binding TargetRecoveryTimeSeconds}" ElementStyle="{StaticResource NumericCell}" Width="135">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TargetRecoveryTimeSeconds" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Target Recovery (s)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding DelayedDurability}" Width="130">
@@ -1022,7 +1331,7 @@
                                       RowStyle="{StaticResource GridRowStyle}"
                                       HeadersVisibility="Column" GridLinesVisibility="Horizontal">
                                 <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding TraceFlag}" Width="120">
+                                    <DataGridTextColumn Binding="{Binding TraceFlag}" ElementStyle="{StaticResource NumericCell}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Trace Flag" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding StatusDisplay}" Width="100">
@@ -1041,6 +1350,63 @@
                 </Grid>
             </TabItem>
 
+            <!-- Daily Summary Tab -->
+            <TabItem Header="Daily Summary">
+                <Grid Margin="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <!-- Date Selection -->
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,6">
+                        <TextBlock Text="Summary Date:" VerticalAlignment="Center" Margin="0,0,6,0" FontWeight="Bold"/>
+                        <Button x:Name="DailySummaryTodayButton" Content="Today" Click="DailySummaryToday_Click" Margin="0,0,6,0" Padding="8,4" MinWidth="60" Style="{StaticResource AccentButton}"/>
+                        <DatePicker x:Name="DailySummaryDatePicker" Width="120" Margin="0,0,6,0" SelectedDateChanged="DailySummaryDate_Changed" CalendarOpened="DatePicker_CalendarOpened"/>
+                        <Button Content="Refresh" Click="DailySummaryRefresh_Click" Margin="0,0,6,0" Padding="8,4" MinWidth="60" Style="{StaticResource SuccessButton}"/>
+                        <TextBlock x:Name="DailySummaryIndicator" Text="Showing: Today (UTC)" VerticalAlignment="Center"
+                                   FontStyle="Italic" Foreground="{DynamicResource AccentBrush}" FontWeight="SemiBold"/>
+                    </StackPanel>
+
+                    <!-- Summary Grid -->
+                    <DataGrid Grid.Row="1" x:Name="DailySummaryGrid"
+                              AutoGenerateColumns="False" IsReadOnly="True"
+                              RowStyle="{StaticResource GridRowStyle}"
+                              HeadersVisibility="Column" GridLinesVisibility="Horizontal">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Binding="{Binding SummaryDateFormatted}" Width="110">
+                                <DataGridTextColumn.Header><TextBlock Text="Date" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding OverallHealth}" Width="120">
+                                <DataGridTextColumn.Header><TextBlock Text="Health" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding TotalWaitFormatted}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                <DataGridTextColumn.Header><TextBlock Text="Total Wait" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding TopWaitType}" Width="180">
+                                <DataGridTextColumn.Header><TextBlock Text="Top Wait Type" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding UniqueQueries, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                <DataGridTextColumn.Header><TextBlock Text="Unique Queries" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding DeadlockCount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                                <DataGridTextColumn.Header><TextBlock Text="Deadlocks" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding BlockingEvents, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                <DataGridTextColumn.Header><TextBlock Text="Blocking Events" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding HighCpuEvents, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                                <DataGridTextColumn.Header><TextBlock Text="High CPU" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                            <DataGridTextColumn Binding="{Binding CollectionErrors, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="120">
+                                <DataGridTextColumn.Header><TextBlock Text="Collect Errors" FontWeight="Bold"/></DataGridTextColumn.Header>
+                            </DataGridTextColumn>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                    <TextBlock Grid.Row="1" x:Name="DailySummaryNoData" Style="{StaticResource NoDataMessage}"/>
+                </Grid>
+            </TabItem>
+
             <!-- Collection Health Tab -->
             <TabItem Header="Collection Health">
                 <Grid Margin="8">
@@ -1049,7 +1415,8 @@
                             <DataGrid x:Name="CollectionHealthGrid"
                                       AutoGenerateColumns="False" IsReadOnly="True"
                                       RowStyle="{StaticResource GridRowStyle}"
-                                      HeadersVisibility="Column" GridLinesVisibility="Horizontal">
+                                      HeadersVisibility="Column" GridLinesVisibility="Horizontal"
+                                      MouseDoubleClick="CollectionHealthGrid_MouseDoubleClick">
                                 <DataGrid.Columns>
                                     <DataGridTextColumn Binding="{Binding CollectorName}" Width="180">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectorName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Collector" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
@@ -1057,16 +1424,16 @@
                                     <DataGridTextColumn Binding="{Binding HealthStatus}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="HealthStatus" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Status" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TotalRuns, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding TotalRuns, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRuns" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Runs" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding SuccessCount, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding SuccessCount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SuccessCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Success" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding ErrorCount, StringFormat=N0}" Width="80">
+                                    <DataGridTextColumn Binding="{Binding ErrorCount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ErrorCount" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Errors" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat=N1}" Width="85">
+                                    <DataGridTextColumn Binding="{Binding FailureRatePercent, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="85">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="FailureRatePercent" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Fail %" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding AvgDurationFormatted}" Width="100">
@@ -1119,7 +1486,7 @@
                                         <DataGridTextColumn Binding="{Binding DuckDbDurationFormatted}" Width="100">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DuckDbDurationFormatted" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="DuckDB (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
-                                        <DataGridTextColumn Binding="{Binding RowsCollected, StringFormat=N0}" Width="80">
+                                        <DataGridTextColumn Binding="{Binding RowsCollected, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80">
                                             <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RowsCollected" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Rows" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                         </DataGridTextColumn>
                                         <DataGridTextColumn Binding="{Binding ErrorMessage}" Width="*">
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index a400e825..ea704080 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -11,13 +11,17 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Controls.Primitives;
+using System.ComponentModel;
+using System.Windows.Data;
 using System.Windows.Threading;
+using Microsoft.Data.SqlClient;
 using Microsoft.Win32;
 using PerformanceMonitorLite.Database;
 using PerformanceMonitorLite.Models;
@@ -45,13 +49,25 @@ public partial class ServerTab : UserControl
     private Helpers.ChartHoverHelper? _tempDbFileIoHover;
     private Helpers.ChartHoverHelper? _fileIoReadHover;
     private Helpers.ChartHoverHelper? _fileIoWriteHover;
+    private Helpers.ChartHoverHelper? _fileIoReadThroughputHover;
+    private Helpers.ChartHoverHelper? _fileIoWriteThroughputHover;
     private Helpers.ChartHoverHelper? _collectorDurationHover;
     private Helpers.ChartHoverHelper? _queryDurationTrendHover;
     private Helpers.ChartHoverHelper? _procDurationTrendHover;
     private Helpers.ChartHoverHelper? _queryStoreDurationTrendHover;
     private Helpers.ChartHoverHelper? _executionCountTrendHover;
+    private Helpers.ChartHoverHelper? _lockWaitTrendHover;
     private Helpers.ChartHoverHelper? _blockingTrendHover;
     private Helpers.ChartHoverHelper? _deadlockTrendHover;
+    private Helpers.ChartHoverHelper? _memoryClerksHover;
+    private Helpers.ChartHoverHelper? _memoryGrantSizingHover;
+    private Helpers.ChartHoverHelper? _memoryGrantActivityHover;
+    private Helpers.ChartHoverHelper? _currentWaitsDurationHover;
+    private Helpers.ChartHoverHelper? _currentWaitsBlockedHover;
+
+    /* Memory clerks picker */
+    private List<SelectableItem> _memoryClerkItems = new();
+    private bool _isUpdatingMemoryClerkSelection;
 
     /* Column filtering */
     private Popup? _filterPopup;
@@ -70,15 +86,12 @@ public partial class ServerTab : UserControl
     private DataGridFilterManager<TraceFlagRow>? _traceFlagsFilterMgr;
     private DataGridFilterManager<CollectorHealthRow>? _collectionHealthFilterMgr;
     private DataGridFilterManager<CollectionLogRow>? _collectionLogFilterMgr;
+    private DateTime? _dailySummaryDate; // null = today
+    private CancellationTokenSource? _actualPlanCts;
 
-    private static readonly HashSet<string> _defaultPerfmonCounters = new(StringComparer.OrdinalIgnoreCase)
-    {
-        "Batch Requests/sec",
-        "Deadlocks/sec",
-        "Query Optimizations/sec",
-        "SQL Compilations/sec",
-        "SQL Re-Compilations/sec"
-    };
+    private static readonly HashSet<string> _defaultPerfmonCounters = new(
+        Helpers.PerfmonPacks.Packs["General Throughput"],
+        StringComparer.OrdinalIgnoreCase);
 
     private static readonly string[] SeriesColors = new[]
     {
@@ -136,6 +149,15 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
         /* Initialize column filter managers */
         InitializeFilterManagers();
 
+        /* Fix DataGrid copy — StackPanel headers copy as type name without this */
+        foreach (var grid in new DataGrid[] { QuerySnapshotsGrid, QueryStatsGrid, ProcedureStatsGrid,
+            QueryStoreGrid, BlockedProcessReportGrid, DeadlockGrid, RunningJobsGrid,
+            ServerConfigGrid, DatabaseConfigGrid, DatabaseScopedConfigGrid, TraceFlagsGrid,
+            CollectionHealthGrid, CollectionLogGrid })
+        {
+            grid.CopyingRowClipboardContent += Helpers.DataGridClipboardBehavior.FixHeaderCopy;
+        }
+
         /* Chart hover tooltips */
         _waitStatsHover = new Helpers.ChartHoverHelper(WaitStatsChart, "ms/sec");
         _perfmonHover = new Helpers.ChartHoverHelper(PerfmonChart, "");
@@ -145,13 +167,46 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
         _tempDbFileIoHover = new Helpers.ChartHoverHelper(TempDbFileIoChart, "ms");
         _fileIoReadHover = new Helpers.ChartHoverHelper(FileIoReadChart, "ms");
         _fileIoWriteHover = new Helpers.ChartHoverHelper(FileIoWriteChart, "ms");
+        _fileIoReadThroughputHover = new Helpers.ChartHoverHelper(FileIoReadThroughputChart, "MB/s");
+        _fileIoWriteThroughputHover = new Helpers.ChartHoverHelper(FileIoWriteThroughputChart, "MB/s");
         _collectorDurationHover = new Helpers.ChartHoverHelper(CollectorDurationChart, "ms");
         _queryDurationTrendHover = new Helpers.ChartHoverHelper(QueryDurationTrendChart, "ms/sec");
         _procDurationTrendHover = new Helpers.ChartHoverHelper(ProcDurationTrendChart, "ms/sec");
         _queryStoreDurationTrendHover = new Helpers.ChartHoverHelper(QueryStoreDurationTrendChart, "ms/sec");
         _executionCountTrendHover = new Helpers.ChartHoverHelper(ExecutionCountTrendChart, "/sec");
+        _lockWaitTrendHover = new Helpers.ChartHoverHelper(LockWaitTrendChart, "ms/sec");
         _blockingTrendHover = new Helpers.ChartHoverHelper(BlockingTrendChart, "incidents");
         _deadlockTrendHover = new Helpers.ChartHoverHelper(DeadlockTrendChart, "deadlocks");
+        _memoryClerksHover = new Helpers.ChartHoverHelper(MemoryClerksChart, "MB");
+        _memoryGrantSizingHover = new Helpers.ChartHoverHelper(MemoryGrantSizingChart, "MB");
+        _memoryGrantActivityHover = new Helpers.ChartHoverHelper(MemoryGrantActivityChart, "");
+        _currentWaitsDurationHover = new Helpers.ChartHoverHelper(CurrentWaitsDurationChart, "ms");
+        _currentWaitsBlockedHover = new Helpers.ChartHoverHelper(CurrentWaitsBlockedChart, "sessions");
+
+        /* Chart context menus (right-click save/export) */
+        Helpers.ContextMenuHelper.SetupChartContextMenu(WaitStatsChart, "Wait_Stats");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(QueryDurationTrendChart, "Query_Duration_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(ProcDurationTrendChart, "Procedure_Duration_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(QueryStoreDurationTrendChart, "QueryStore_Duration_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(ExecutionCountTrendChart, "Execution_Count_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(CpuChart, "CPU_Usage");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(MemoryChart, "Memory_Usage");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(MemoryClerksChart, "Memory_Clerks");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(MemoryGrantSizingChart, "Memory_Grant_Sizing");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(MemoryGrantActivityChart, "Memory_Grant_Activity");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(FileIoReadChart, "File_IO_Read_Latency");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(FileIoWriteChart, "File_IO_Write_Latency");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(FileIoReadThroughputChart, "File_IO_Read_Throughput");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(FileIoWriteThroughputChart, "File_IO_Write_Throughput");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(TempDbChart, "TempDB_Stats");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(TempDbFileIoChart, "TempDB_File_IO");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(LockWaitTrendChart, "Lock_Wait_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(BlockingTrendChart, "Blocking_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(DeadlockTrendChart, "Deadlock_Trends");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(CurrentWaitsDurationChart, "Current_Waits_Duration");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(CurrentWaitsBlockedChart, "Current_Waits_Blocked");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(PerfmonChart, "Perfmon_Counters");
+        Helpers.ContextMenuHelper.SetupChartContextMenu(CollectorDurationChart, "Collector_Duration");
 
         /* Initial load is triggered by MainWindow.ConnectToServer calling RefreshData()
            after collectors finish - no Loaded handler needed */
@@ -449,18 +504,21 @@ private async System.Threading.Tasks.Task RefreshAllDataAsync()
             var cpuTask = _dataService.GetCpuUtilizationAsync(_serverId, hoursBack, fromDate, toDate);
             var memoryTask = _dataService.GetLatestMemoryStatsAsync(_serverId);
             var memoryTrendTask = _dataService.GetMemoryTrendAsync(_serverId, hoursBack, fromDate, toDate);
-            var queryStatsTask = _dataService.GetTopQueriesByCpuAsync(_serverId, hoursBack, 50, fromDate, toDate);
-            var procStatsTask = _dataService.GetTopProceduresByCpuAsync(_serverId, hoursBack, 50, fromDate, toDate);
+            var queryStatsTask = _dataService.GetTopQueriesByCpuAsync(_serverId, hoursBack, 50, fromDate, toDate, UtcOffsetMinutes);
+            var procStatsTask = _dataService.GetTopProceduresByCpuAsync(_serverId, hoursBack, 50, fromDate, toDate, UtcOffsetMinutes);
             var fileIoTask = _dataService.GetLatestFileIoStatsAsync(_serverId);
             var fileIoTrendTask = _dataService.GetFileIoLatencyTrendAsync(_serverId, hoursBack, fromDate, toDate);
+            var fileIoThroughputTask = _dataService.GetFileIoThroughputTrendAsync(_serverId, hoursBack, fromDate, toDate);
             var tempDbTask = _dataService.GetTempDbTrendAsync(_serverId, hoursBack, fromDate, toDate);
             var tempDbFileIoTask = _dataService.GetTempDbFileIoTrendAsync(_serverId, hoursBack, fromDate, toDate);
             var deadlockTask = _dataService.GetRecentDeadlocksAsync(_serverId, hoursBack, fromDate, toDate);
             var blockedProcessTask = _dataService.GetRecentBlockedProcessReportsAsync(_serverId, hoursBack, fromDate, toDate);
             var waitTypesTask = _dataService.GetDistinctWaitTypesAsync(_serverId, hoursBack, fromDate, toDate);
+            var memoryClerkTypesTask = _dataService.GetDistinctMemoryClerkTypesAsync(_serverId, hoursBack, fromDate, toDate);
             var perfmonCountersTask = _dataService.GetDistinctPerfmonCountersAsync(_serverId, hoursBack, fromDate, toDate);
             var queryStoreTask = _dataService.GetQueryStoreTopQueriesAsync(_serverId, hoursBack, 50, fromDate, toDate);
             var memoryGrantTrendTask = _dataService.GetMemoryGrantTrendAsync(_serverId, hoursBack, fromDate, toDate);
+            var memoryGrantChartTask = _dataService.GetMemoryGrantChartDataAsync(_serverId, hoursBack, fromDate, toDate);
             var serverConfigTask = SafeQueryAsync(() => _dataService.GetLatestServerConfigAsync(_serverId));
             var databaseConfigTask = SafeQueryAsync(() => _dataService.GetLatestDatabaseConfigAsync(_serverId));
             var databaseScopedConfigTask = SafeQueryAsync(() => _dataService.GetLatestDatabaseScopedConfigAsync(_serverId));
@@ -468,26 +526,31 @@ private async System.Threading.Tasks.Task RefreshAllDataAsync()
             var runningJobsTask = SafeQueryAsync(() => _dataService.GetRunningJobsAsync(_serverId));
             var collectionHealthTask = SafeQueryAsync(() => _dataService.GetCollectionHealthAsync(_serverId));
             var collectionLogTask = SafeQueryAsync(() => _dataService.GetRecentCollectionLogAsync(_serverId, hoursBack));
+            var dailySummaryTask = _dataService.GetDailySummaryAsync(_serverId, _dailySummaryDate);
             /* Core data tasks */
             await System.Threading.Tasks.Task.WhenAll(
                 snapshotsTask, cpuTask, memoryTask, memoryTrendTask,
-                queryStatsTask, procStatsTask, fileIoTask, fileIoTrendTask, tempDbTask, tempDbFileIoTask,
-                deadlockTask, blockedProcessTask, waitTypesTask, perfmonCountersTask,
-                queryStoreTask, memoryGrantTrendTask,
+                queryStatsTask, procStatsTask, fileIoTask, fileIoTrendTask, fileIoThroughputTask, tempDbTask, tempDbFileIoTask,
+                deadlockTask, blockedProcessTask, waitTypesTask, memoryClerkTypesTask, perfmonCountersTask,
+                queryStoreTask, memoryGrantTrendTask, memoryGrantChartTask,
                 serverConfigTask, databaseConfigTask, databaseScopedConfigTask, traceFlagsTask,
-                runningJobsTask, collectionHealthTask, collectionLogTask);
+                runningJobsTask, collectionHealthTask, collectionLogTask, dailySummaryTask);
 
             /* Trend chart tasks - run separately so failures don't kill the whole refresh */
+            var lockWaitTrendTask = SafeQueryAsync(() => _dataService.GetLockWaitTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var blockingTrendTask = SafeQueryAsync(() => _dataService.GetBlockingTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var deadlockTrendTask = SafeQueryAsync(() => _dataService.GetDeadlockTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var queryDurationTrendTask = SafeQueryAsync(() => _dataService.GetQueryDurationTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var procDurationTrendTask = SafeQueryAsync(() => _dataService.GetProcedureDurationTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var queryStoreDurationTrendTask = SafeQueryAsync(() => _dataService.GetQueryStoreDurationTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var executionCountTrendTask = SafeQueryAsync(() => _dataService.GetExecutionCountTrendAsync(_serverId, hoursBack, fromDate, toDate));
+            var currentWaitsDurationTask = SafeQueryAsync(() => _dataService.GetWaitingTaskTrendAsync(_serverId, hoursBack, fromDate, toDate));
+            var currentWaitsBlockedTask = SafeQueryAsync(() => _dataService.GetBlockedSessionTrendAsync(_serverId, hoursBack, fromDate, toDate));
 
             await System.Threading.Tasks.Task.WhenAll(
-                blockingTrendTask, deadlockTrendTask,
-                queryDurationTrendTask, procDurationTrendTask, queryStoreDurationTrendTask, executionCountTrendTask);
+                lockWaitTrendTask, blockingTrendTask, deadlockTrendTask,
+                queryDurationTrendTask, procDurationTrendTask, queryStoreDurationTrendTask, executionCountTrendTask,
+                currentWaitsDurationTask, currentWaitsBlockedTask);
 
             loadSw.Stop();
 
@@ -502,11 +565,15 @@ await System.Threading.Tasks.Task.WhenAll(
 
             /* Update grids (via filter managers to preserve active filters) */
             _querySnapshotsFilterMgr!.UpdateData(snapshotsTask.Result);
+            LiveSnapshotIndicator.Text = "";
             _queryStatsFilterMgr!.UpdateData(queryStatsTask.Result);
+            SetInitialSort(QueryStatsGrid, "TotalElapsedMs", ListSortDirection.Descending);
             _procStatsFilterMgr!.UpdateData(procStatsTask.Result);
+            SetInitialSort(ProcedureStatsGrid, "TotalElapsedMs", ListSortDirection.Descending);
             _blockedProcessFilterMgr!.UpdateData(blockedProcessTask.Result);
             _deadlockFilterMgr!.UpdateData(DeadlockProcessDetail.ParseFromRows(deadlockTask.Result));
             _queryStoreFilterMgr!.UpdateData(queryStoreTask.Result);
+            SetInitialSort(QueryStoreGrid, "TotalDurationMs", ListSortDirection.Descending);
             _serverConfigFilterMgr!.UpdateData(serverConfigTask.Result);
             _databaseConfigFilterMgr!.UpdateData(databaseConfigTask.Result);
             _dbScopedConfigFilterMgr!.UpdateData(databaseScopedConfigTask.Result);
@@ -514,6 +581,11 @@ await System.Threading.Tasks.Task.WhenAll(
             _runningJobsFilterMgr!.UpdateData(runningJobsTask.Result);
             _collectionHealthFilterMgr!.UpdateData(collectionHealthTask.Result);
             _collectionLogFilterMgr!.UpdateData(collectionLogTask.Result);
+            var dailySummary = await dailySummaryTask;
+            DailySummaryGrid.ItemsSource = dailySummary != null
+                ? new List<DailySummaryRow> { dailySummary } : null;
+            DailySummaryNoData.Visibility = dailySummary == null
+                ? System.Windows.Visibility.Visible : System.Windows.Visibility.Collapsed;
             UpdateCollectorDurationChart(collectionLogTask.Result);
 
             /* Update memory summary */
@@ -525,19 +597,26 @@ await System.Threading.Tasks.Task.WhenAll(
             UpdateTempDbChart(tempDbTask.Result);
             UpdateTempDbFileIoChart(tempDbFileIoTask.Result);
             UpdateFileIoCharts(fileIoTrendTask.Result);
+            UpdateFileIoThroughputCharts(fileIoThroughputTask.Result);
+            UpdateLockWaitTrendChart(lockWaitTrendTask.Result, hoursBack, fromDate, toDate);
             UpdateBlockingTrendChart(blockingTrendTask.Result, hoursBack, fromDate, toDate);
             UpdateDeadlockTrendChart(deadlockTrendTask.Result, hoursBack, fromDate, toDate);
+            UpdateCurrentWaitsDurationChart(currentWaitsDurationTask.Result, hoursBack, fromDate, toDate);
+            UpdateCurrentWaitsBlockedChart(currentWaitsBlockedTask.Result, hoursBack, fromDate, toDate);
             UpdateQueryDurationTrendChart(queryDurationTrendTask.Result);
             UpdateProcDurationTrendChart(procDurationTrendTask.Result);
             UpdateQueryStoreDurationTrendChart(queryStoreDurationTrendTask.Result);
             UpdateExecutionCountTrendChart(executionCountTrendTask.Result);
+            UpdateMemoryGrantCharts(memoryGrantChartTask.Result);
 
             /* Populate pickers (preserve selections) */
             PopulateWaitTypePicker(waitTypesTask.Result);
+            PopulateMemoryClerkPicker(memoryClerkTypesTask.Result);
             PopulatePerfmonPicker(perfmonCountersTask.Result);
 
             /* Update picker-driven charts */
             await UpdateWaitStatsChartFromPickerAsync();
+            await UpdateMemoryClerksChartFromPickerAsync();
             await UpdatePerfmonChartFromPickerAsync();
 
             ConnectionStatusText.Text = $"{_server.ServerName} - Last refresh: {DateTime.Now:HH:mm:ss}";
@@ -584,20 +663,28 @@ private void UpdateMemorySummary(MemoryStatsRow? stats)
         if (stats == null)
         {
             PhysicalMemoryText.Text = "--";
+            AvailablePhysicalMemoryText.Text = "--";
             TotalServerMemoryText.Text = "--";
             TargetServerMemoryText.Text = "--";
             BufferPoolText.Text = "--";
             PlanCacheText.Text = "--";
+            TotalPageFileText.Text = "--";
+            AvailablePageFileText.Text = "--";
             MemoryStateText.Text = "--";
+            SqlMemoryModelText.Text = "--";
             return;
         }
 
         PhysicalMemoryText.Text = FormatMb(stats.TotalPhysicalMemoryMb);
+        AvailablePhysicalMemoryText.Text = FormatMb(stats.AvailablePhysicalMemoryMb);
         TotalServerMemoryText.Text = FormatMb(stats.TotalServerMemoryMb);
         TargetServerMemoryText.Text = FormatMb(stats.TargetServerMemoryMb);
         BufferPoolText.Text = FormatMb(stats.BufferPoolMb);
         PlanCacheText.Text = FormatMb(stats.PlanCacheMb);
+        TotalPageFileText.Text = FormatMb(stats.TotalPageFileMb);
+        AvailablePageFileText.Text = FormatMb(stats.AvailablePageFileMb);
         MemoryStateText.Text = stats.SystemMemoryState;
+        SqlMemoryModelText.Text = stats.SqlMemoryModel;
     }
 
     private static string FormatMb(double mb)
@@ -695,6 +782,96 @@ private void UpdateMemoryChart(List<MemoryTrendPoint> data, List<MemoryTrendPoin
         MemoryChart.Refresh();
     }
 
+    private void UpdateMemoryGrantCharts(List<MemoryGrantChartPoint> data)
+    {
+        ClearChart(MemoryGrantSizingChart);
+        ClearChart(MemoryGrantActivityChart);
+        _memoryGrantSizingHover?.Clear();
+        _memoryGrantActivityHover?.Clear();
+        ApplyDarkTheme(MemoryGrantSizingChart);
+        ApplyDarkTheme(MemoryGrantActivityChart);
+
+        if (data.Count == 0)
+        {
+            MemoryGrantSizingChart.Refresh();
+            MemoryGrantActivityChart.Refresh();
+            return;
+        }
+
+        var poolIds = data.Select(d => d.PoolId).Distinct().OrderBy(p => p).ToList();
+        int colorIndex = 0;
+
+        /* Chart 1: Memory Grant Sizing — Available, Granted, Used MB per pool */
+        double sizingMax = 0;
+        var sizingMetrics = new (string Name, Func<MemoryGrantChartPoint, double> Selector)[]
+        {
+            ("Available MB", d => d.AvailableMemoryMb),
+            ("Granted MB", d => d.GrantedMemoryMb),
+            ("Used MB", d => d.UsedMemoryMb)
+        };
+
+        foreach (var poolId in poolIds)
+        {
+            var poolData = data.Where(d => d.PoolId == poolId).OrderBy(d => d.CollectionTime).ToList();
+            var times = poolData.Select(d => d.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+
+            foreach (var metric in sizingMetrics)
+            {
+                var values = poolData.Select(d => metric.Selector(d)).ToArray();
+                var plot = MemoryGrantSizingChart.Plot.Add.Scatter(times, values);
+                var label = $"Pool {poolId}: {metric.Name}";
+                plot.LegendText = label;
+                plot.Color = ScottPlot.Color.FromHex(SeriesColors[colorIndex % SeriesColors.Length]);
+                _memoryGrantSizingHover?.Add(plot, label);
+                if (values.Length > 0) sizingMax = Math.Max(sizingMax, values.Max());
+                colorIndex++;
+            }
+        }
+
+        MemoryGrantSizingChart.Plot.Axes.DateTimeTicksBottom();
+        ReapplyAxisColors(MemoryGrantSizingChart);
+        MemoryGrantSizingChart.Plot.YLabel("Memory (MB)");
+        SetChartYLimitsWithLegendPadding(MemoryGrantSizingChart, 0, sizingMax > 0 ? sizingMax : 100);
+        ShowChartLegend(MemoryGrantSizingChart);
+        MemoryGrantSizingChart.Refresh();
+
+        /* Chart 2: Memory Grant Activity — Grantees, Waiters, Timeouts, Forced per pool */
+        double activityMax = 0;
+        colorIndex = 0;
+        var activityMetrics = new (string Name, Func<MemoryGrantChartPoint, double> Selector)[]
+        {
+            ("Grantees", d => d.GranteeCount),
+            ("Waiters", d => d.WaiterCount),
+            ("Timeouts", d => d.TimeoutErrorCountDelta),
+            ("Forced Grants", d => d.ForcedGrantCountDelta)
+        };
+
+        foreach (var poolId in poolIds)
+        {
+            var poolData = data.Where(d => d.PoolId == poolId).OrderBy(d => d.CollectionTime).ToList();
+            var times = poolData.Select(d => d.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+
+            foreach (var metric in activityMetrics)
+            {
+                var values = poolData.Select(d => metric.Selector(d)).ToArray();
+                var plot = MemoryGrantActivityChart.Plot.Add.Scatter(times, values);
+                var label = $"Pool {poolId}: {metric.Name}";
+                plot.LegendText = label;
+                plot.Color = ScottPlot.Color.FromHex(SeriesColors[colorIndex % SeriesColors.Length]);
+                _memoryGrantActivityHover?.Add(plot, label);
+                if (values.Length > 0) activityMax = Math.Max(activityMax, values.Max());
+                colorIndex++;
+            }
+        }
+
+        MemoryGrantActivityChart.Plot.Axes.DateTimeTicksBottom();
+        ReapplyAxisColors(MemoryGrantActivityChart);
+        MemoryGrantActivityChart.Plot.YLabel("Count");
+        SetChartYLimitsWithLegendPadding(MemoryGrantActivityChart, 0, activityMax > 0 ? activityMax : 10);
+        ShowChartLegend(MemoryGrantActivityChart);
+        MemoryGrantActivityChart.Refresh();
+    }
+
     private void UpdateTempDbChart(List<TempDbRow> data)
     {
         ClearChart(TempDbChart);
@@ -788,16 +965,18 @@ private void UpdateFileIoCharts(List<FileIoTrendPoint> data)
 
         if (data.Count == 0) { FileIoReadChart.Refresh(); FileIoWriteChart.Refresh(); return; }
 
-        /* Group by database, limit to top 12 by total stall */
+        /* Group by file, limit to top 10 by total stall */
         var databases = data
-            .GroupBy(d => d.DatabaseName)
+            .GroupBy(d => $"{d.DatabaseName}.{d.FileName}")
             .OrderByDescending(g => g.Sum(d => d.AvgReadLatencyMs + d.AvgWriteLatencyMs))
-            .Take(12)
+            .Take(10)
             .ToList();
 
         double readMax = 0, writeMax = 0;
         int colorIdx = 0;
 
+        bool hasQueuedData = data.Any(d => d.AvgQueuedReadLatencyMs > 0 || d.AvgQueuedWriteLatencyMs > 0);
+
         foreach (var dbGroup in databases)
         {
             var points = dbGroup.OrderBy(d => d.CollectionTime).ToList();
@@ -824,6 +1003,31 @@ private void UpdateFileIoCharts(List<FileIoTrendPoint> data)
                 _fileIoWriteHover?.Add(writePlot, dbGroup.Key);
                 writeMax = Math.Max(writeMax, writeLatency.Max());
             }
+
+            /* Queued I/O overlay — dashed lines showing queue wait portion of latency */
+            if (hasQueuedData)
+            {
+                var queuedReadLatency = points.Select(d => d.AvgQueuedReadLatencyMs).ToArray();
+                var queuedWriteLatency = points.Select(d => d.AvgQueuedWriteLatencyMs).ToArray();
+
+                if (queuedReadLatency.Any(v => v > 0))
+                {
+                    var qReadPlot = FileIoReadChart.Plot.Add.Scatter(times, queuedReadLatency);
+                    qReadPlot.LegendText = $"{dbGroup.Key} (queued)";
+                    qReadPlot.Color = color;
+                    qReadPlot.LinePattern = ScottPlot.LinePattern.Dashed;
+                    _fileIoReadHover?.Add(qReadPlot, $"{dbGroup.Key} (queued)");
+                }
+
+                if (queuedWriteLatency.Any(v => v > 0))
+                {
+                    var qWritePlot = FileIoWriteChart.Plot.Add.Scatter(times, queuedWriteLatency);
+                    qWritePlot.LegendText = $"{dbGroup.Key} (queued)";
+                    qWritePlot.Color = color;
+                    qWritePlot.LinePattern = ScottPlot.LinePattern.Dashed;
+                    _fileIoWriteHover?.Add(qWritePlot, $"{dbGroup.Key} (queued)");
+                }
+            }
         }
 
         FileIoReadChart.Plot.Axes.DateTimeTicksBottom();
@@ -841,8 +1045,134 @@ private void UpdateFileIoCharts(List<FileIoTrendPoint> data)
         FileIoWriteChart.Refresh();
     }
 
+    private void UpdateFileIoThroughputCharts(List<FileIoThroughputPoint> data)
+    {
+        ClearChart(FileIoReadThroughputChart);
+        ClearChart(FileIoWriteThroughputChart);
+        _fileIoReadThroughputHover?.Clear();
+        _fileIoWriteThroughputHover?.Clear();
+        ApplyDarkTheme(FileIoReadThroughputChart);
+        ApplyDarkTheme(FileIoWriteThroughputChart);
+
+        if (data.Count == 0) { FileIoReadThroughputChart.Refresh(); FileIoWriteThroughputChart.Refresh(); return; }
+
+        /* Group by file label, limit to top 10 by total throughput */
+        var files = data
+            .GroupBy(d => d.FileLabel)
+            .OrderByDescending(g => g.Sum(d => d.ReadMbPerSec + d.WriteMbPerSec))
+            .Take(10)
+            .ToList();
+
+        double readMax = 0, writeMax = 0;
+        int colorIdx = 0;
+
+        foreach (var fileGroup in files)
+        {
+            var points = fileGroup.OrderBy(d => d.CollectionTime).ToList();
+            var times = points.Select(d => d.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+            var readThroughput = points.Select(d => d.ReadMbPerSec).ToArray();
+            var writeThroughput = points.Select(d => d.WriteMbPerSec).ToArray();
+            var color = ScottPlot.Color.FromHex(SeriesColors[colorIdx % SeriesColors.Length]);
+            colorIdx++;
+
+            if (readThroughput.Length > 0)
+            {
+                var readPlot = FileIoReadThroughputChart.Plot.Add.Scatter(times, readThroughput);
+                readPlot.LegendText = fileGroup.Key;
+                readPlot.Color = color;
+                _fileIoReadThroughputHover?.Add(readPlot, fileGroup.Key);
+                readMax = Math.Max(readMax, readThroughput.Max());
+            }
+
+            if (writeThroughput.Length > 0)
+            {
+                var writePlot = FileIoWriteThroughputChart.Plot.Add.Scatter(times, writeThroughput);
+                writePlot.LegendText = fileGroup.Key;
+                writePlot.Color = color;
+                _fileIoWriteThroughputHover?.Add(writePlot, fileGroup.Key);
+                writeMax = Math.Max(writeMax, writeThroughput.Max());
+            }
+        }
+
+        FileIoReadThroughputChart.Plot.Axes.DateTimeTicksBottom();
+        ReapplyAxisColors(FileIoReadThroughputChart);
+        FileIoReadThroughputChart.Plot.YLabel("Read Throughput (MB/s)");
+        SetChartYLimitsWithLegendPadding(FileIoReadThroughputChart, 0, readMax > 0 ? readMax : 1);
+        ShowChartLegend(FileIoReadThroughputChart);
+        FileIoReadThroughputChart.Refresh();
+
+        FileIoWriteThroughputChart.Plot.Axes.DateTimeTicksBottom();
+        ReapplyAxisColors(FileIoWriteThroughputChart);
+        FileIoWriteThroughputChart.Plot.YLabel("Write Throughput (MB/s)");
+        SetChartYLimitsWithLegendPadding(FileIoWriteThroughputChart, 0, writeMax > 0 ? writeMax : 1);
+        ShowChartLegend(FileIoWriteThroughputChart);
+        FileIoWriteThroughputChart.Refresh();
+    }
+
     /* ========== Blocking/Deadlock Trend Charts ========== */
 
+    private void UpdateLockWaitTrendChart(List<LockWaitTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+    {
+        ClearChart(LockWaitTrendChart);
+        ApplyDarkTheme(LockWaitTrendChart);
+
+        DateTime rangeStart, rangeEnd;
+        if (fromDate.HasValue && toDate.HasValue)
+        {
+            rangeStart = fromDate.Value;
+            rangeEnd = toDate.Value;
+        }
+        else
+        {
+            rangeEnd = DateTime.UtcNow.AddMinutes(UtcOffsetMinutes);
+            rangeStart = rangeEnd.AddHours(-hoursBack);
+        }
+
+        _lockWaitTrendHover?.Clear();
+        if (data.Count == 0)
+        {
+            var zeroLine = LockWaitTrendChart.Plot.Add.Scatter(
+                new[] { rangeStart.ToOADate(), rangeEnd.ToOADate() },
+                new[] { 0.0, 0.0 });
+            zeroLine.LegendText = "Lock Waits";
+            zeroLine.Color = ScottPlot.Color.FromHex("#4FC3F7");
+            zeroLine.MarkerSize = 0;
+            LockWaitTrendChart.Plot.Axes.DateTimeTicksBottom();
+            LockWaitTrendChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+            ReapplyAxisColors(LockWaitTrendChart);
+            LockWaitTrendChart.Plot.YLabel("Lock Wait Time (ms/sec)");
+            SetChartYLimitsWithLegendPadding(LockWaitTrendChart, 0, 1);
+            ShowChartLegend(LockWaitTrendChart);
+            LockWaitTrendChart.Refresh();
+            return;
+        }
+
+        var grouped = data.GroupBy(d => d.WaitType).ToList();
+        double globalMax = 0;
+
+        for (int i = 0; i < grouped.Count; i++)
+        {
+            var group = grouped[i];
+            var times = group.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+            var values = group.Select(t => t.WaitTimeMsPerSecond).ToArray();
+
+            var plot = LockWaitTrendChart.Plot.Add.Scatter(times, values);
+            plot.LegendText = group.Key;
+            plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
+            _lockWaitTrendHover?.Add(plot, group.Key);
+
+            if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
+        }
+
+        LockWaitTrendChart.Plot.Axes.DateTimeTicksBottom();
+        LockWaitTrendChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+        ReapplyAxisColors(LockWaitTrendChart);
+        LockWaitTrendChart.Plot.YLabel("Lock Wait Time (ms/sec)");
+        SetChartYLimitsWithLegendPadding(LockWaitTrendChart, 0, globalMax > 0 ? globalMax : 1);
+        ShowChartLegend(LockWaitTrendChart);
+        LockWaitTrendChart.Refresh();
+    }
+
     private void UpdateBlockingTrendChart(List<TrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(BlockingTrendChart);
@@ -1001,6 +1331,138 @@ private void UpdateDeadlockTrendChart(List<TrendPoint> data, int hoursBack, Date
         DeadlockTrendChart.Refresh();
     }
 
+    /* ========== Current Waits Charts ========== */
+
+    private void UpdateCurrentWaitsDurationChart(List<WaitingTaskTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+    {
+        ClearChart(CurrentWaitsDurationChart);
+        ApplyDarkTheme(CurrentWaitsDurationChart);
+
+        DateTime rangeStart, rangeEnd;
+        if (fromDate.HasValue && toDate.HasValue)
+        {
+            rangeStart = fromDate.Value;
+            rangeEnd = toDate.Value;
+        }
+        else
+        {
+            rangeEnd = DateTime.UtcNow.AddMinutes(UtcOffsetMinutes);
+            rangeStart = rangeEnd.AddHours(-hoursBack);
+        }
+
+        _currentWaitsDurationHover?.Clear();
+        if (data.Count == 0)
+        {
+            var zeroLine = CurrentWaitsDurationChart.Plot.Add.Scatter(
+                new[] { rangeStart.ToOADate(), rangeEnd.ToOADate() },
+                new[] { 0.0, 0.0 });
+            zeroLine.LegendText = "Current Waits";
+            zeroLine.Color = ScottPlot.Color.FromHex("#4FC3F7");
+            zeroLine.MarkerSize = 0;
+            CurrentWaitsDurationChart.Plot.Axes.DateTimeTicksBottom();
+            CurrentWaitsDurationChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+            ReapplyAxisColors(CurrentWaitsDurationChart);
+            CurrentWaitsDurationChart.Plot.YLabel("Total Wait Duration (ms)");
+            SetChartYLimitsWithLegendPadding(CurrentWaitsDurationChart, 0, 1);
+            ShowChartLegend(CurrentWaitsDurationChart);
+            CurrentWaitsDurationChart.Refresh();
+            return;
+        }
+
+        var grouped = data.GroupBy(d => d.WaitType).OrderBy(g => g.Key).ToList();
+        double globalMax = 0;
+
+        for (int i = 0; i < grouped.Count; i++)
+        {
+            var group = grouped[i];
+            var ordered = group.OrderBy(t => t.CollectionTime).ToList();
+            var times = ordered.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+            var values = ordered.Select(t => (double)t.TotalWaitMs).ToArray();
+
+            var plot = CurrentWaitsDurationChart.Plot.Add.Scatter(times, values);
+            plot.LegendText = group.Key;
+            plot.LineWidth = 2;
+            plot.MarkerSize = 5;
+            plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
+            _currentWaitsDurationHover?.Add(plot, group.Key);
+
+            if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
+        }
+
+        CurrentWaitsDurationChart.Plot.Axes.DateTimeTicksBottom();
+        CurrentWaitsDurationChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+        ReapplyAxisColors(CurrentWaitsDurationChart);
+        CurrentWaitsDurationChart.Plot.YLabel("Total Wait Duration (ms)");
+        SetChartYLimitsWithLegendPadding(CurrentWaitsDurationChart, 0, globalMax > 0 ? globalMax : 1);
+        ShowChartLegend(CurrentWaitsDurationChart);
+        CurrentWaitsDurationChart.Refresh();
+    }
+
+    private void UpdateCurrentWaitsBlockedChart(List<BlockedSessionTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+    {
+        ClearChart(CurrentWaitsBlockedChart);
+        ApplyDarkTheme(CurrentWaitsBlockedChart);
+
+        DateTime rangeStart, rangeEnd;
+        if (fromDate.HasValue && toDate.HasValue)
+        {
+            rangeStart = fromDate.Value;
+            rangeEnd = toDate.Value;
+        }
+        else
+        {
+            rangeEnd = DateTime.UtcNow.AddMinutes(UtcOffsetMinutes);
+            rangeStart = rangeEnd.AddHours(-hoursBack);
+        }
+
+        _currentWaitsBlockedHover?.Clear();
+        if (data.Count == 0)
+        {
+            var zeroLine = CurrentWaitsBlockedChart.Plot.Add.Scatter(
+                new[] { rangeStart.ToOADate(), rangeEnd.ToOADate() },
+                new[] { 0.0, 0.0 });
+            zeroLine.LegendText = "Blocked Sessions";
+            zeroLine.Color = ScottPlot.Color.FromHex("#E57373");
+            zeroLine.MarkerSize = 0;
+            CurrentWaitsBlockedChart.Plot.Axes.DateTimeTicksBottom();
+            CurrentWaitsBlockedChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+            ReapplyAxisColors(CurrentWaitsBlockedChart);
+            CurrentWaitsBlockedChart.Plot.YLabel("Blocked Sessions");
+            SetChartYLimitsWithLegendPadding(CurrentWaitsBlockedChart, 0, 1);
+            ShowChartLegend(CurrentWaitsBlockedChart);
+            CurrentWaitsBlockedChart.Refresh();
+            return;
+        }
+
+        var grouped = data.GroupBy(d => d.DatabaseName).OrderBy(g => g.Key).ToList();
+        double globalMax = 0;
+
+        for (int i = 0; i < grouped.Count; i++)
+        {
+            var group = grouped[i];
+            var ordered = group.OrderBy(t => t.CollectionTime).ToList();
+            var times = ordered.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+            var values = ordered.Select(t => (double)t.BlockedCount).ToArray();
+
+            var plot = CurrentWaitsBlockedChart.Plot.Add.Scatter(times, values);
+            plot.LegendText = group.Key;
+            plot.LineWidth = 2;
+            plot.MarkerSize = 5;
+            plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
+            _currentWaitsBlockedHover?.Add(plot, group.Key);
+
+            if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
+        }
+
+        CurrentWaitsBlockedChart.Plot.Axes.DateTimeTicksBottom();
+        CurrentWaitsBlockedChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+        ReapplyAxisColors(CurrentWaitsBlockedChart);
+        CurrentWaitsBlockedChart.Plot.YLabel("Blocked Sessions");
+        SetChartYLimitsWithLegendPadding(CurrentWaitsBlockedChart, 0, globalMax > 0 ? globalMax : 1);
+        ShowChartLegend(CurrentWaitsBlockedChart);
+        CurrentWaitsBlockedChart.Refresh();
+    }
+
     /* ========== Performance Trend Charts ========== */
 
     private void UpdateQueryDurationTrendChart(List<QueryTrendPoint> data)
@@ -1282,90 +1744,97 @@ private async System.Threading.Tasks.Task UpdateWaitStatsChartFromPickerAsync()
         }
     }
 
-    /* ========== Perfmon Picker ========== */
-
-    private bool _isUpdatingPerfmonSelection;
+    /* ========== Memory Clerks Picker ========== */
 
-    private void PopulatePerfmonPicker(List<string> counters)
+    private void PopulateMemoryClerkPicker(List<string> clerkTypes)
     {
-        var previouslySelected = new HashSet<string>(_perfmonCounterItems.Where(i => i.IsSelected).Select(i => i.DisplayName));
-        _perfmonCounterItems = counters.Select(c => new SelectableItem
+        var previouslySelected = new HashSet<string>(_memoryClerkItems.Where(i => i.IsSelected).Select(i => i.DisplayName));
+        var topClerks = previouslySelected.Count == 0 ? new HashSet<string>(clerkTypes.Take(5)) : null;
+        _memoryClerkItems = clerkTypes.Select(c => new SelectableItem
         {
             DisplayName = c,
-            IsSelected = previouslySelected.Contains(c)
-                || (previouslySelected.Count == 0 && _defaultPerfmonCounters.Contains(c))
+            IsSelected = previouslySelected.Contains(c) || (topClerks != null && topClerks.Contains(c))
         }).ToList();
-        RefreshPerfmonListOrder();
+        RefreshMemoryClerkListOrder();
     }
 
-    private void RefreshPerfmonListOrder()
+    private void RefreshMemoryClerkListOrder()
     {
-        if (_perfmonCounterItems == null) return;
-        _perfmonCounterItems = _perfmonCounterItems
+        if (_memoryClerkItems == null) return;
+        _memoryClerkItems = _memoryClerkItems
             .OrderByDescending(x => x.IsSelected)
-            .ThenBy(x => _perfmonCounterItems.IndexOf(x))
+            .ThenBy(x => x.DisplayName)
             .ToList();
-        ApplyPerfmonFilter();
+        ApplyMemoryClerkFilter();
+        UpdateMemoryClerkCount();
     }
 
-    private void ApplyPerfmonFilter()
+    private void UpdateMemoryClerkCount()
     {
-        var search = PerfmonSearchBox?.Text?.Trim() ?? "";
-        PerfmonCountersList.ItemsSource = null;
+        if (_memoryClerkItems == null || MemoryClerkCountText == null) return;
+        int count = _memoryClerkItems.Count(x => x.IsSelected);
+        MemoryClerkCountText.Text = $"{count} selected";
+    }
+
+    private void ApplyMemoryClerkFilter()
+    {
+        var search = MemoryClerkSearchBox?.Text?.Trim() ?? "";
+        MemoryClerksList.ItemsSource = null;
         if (string.IsNullOrEmpty(search))
-            PerfmonCountersList.ItemsSource = _perfmonCounterItems;
+            MemoryClerksList.ItemsSource = _memoryClerkItems;
         else
-            PerfmonCountersList.ItemsSource = _perfmonCounterItems.Where(i => i.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)).ToList();
+            MemoryClerksList.ItemsSource = _memoryClerkItems.Where(i => i.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)).ToList();
     }
 
-    private void PerfmonSearch_TextChanged(object sender, TextChangedEventArgs e) => ApplyPerfmonFilter();
+    private void MemoryClerkSearch_TextChanged(object sender, TextChangedEventArgs e) => ApplyMemoryClerkFilter();
 
-    private void PerfmonSelectAll_Click(object sender, RoutedEventArgs e)
+    private void MemoryClerkSelectTop_Click(object sender, RoutedEventArgs e)
     {
-        _isUpdatingPerfmonSelection = true;
-        var visible = (PerfmonCountersList.ItemsSource as IEnumerable<SelectableItem>)?.ToList() ?? _perfmonCounterItems;
-        int count = visible.Count(i => i.IsSelected);
-        foreach (var item in visible)
+        _isUpdatingMemoryClerkSelection = true;
+        var topClerks = new HashSet<string>(_memoryClerkItems.Take(5).Select(x => x.DisplayName));
+        foreach (var item in _memoryClerkItems)
         {
-            if (!item.IsSelected && count < 12)
-            {
-                item.IsSelected = true;
-                count++;
-            }
+            item.IsSelected = topClerks.Contains(item.DisplayName);
         }
-        _isUpdatingPerfmonSelection = false;
-        RefreshPerfmonListOrder();
-        _ = UpdatePerfmonChartFromPickerAsync();
+        _isUpdatingMemoryClerkSelection = false;
+        RefreshMemoryClerkListOrder();
+        _ = UpdateMemoryClerksChartFromPickerAsync();
     }
 
-    private void PerfmonClearAll_Click(object sender, RoutedEventArgs e)
+    private void MemoryClerkClearAll_Click(object sender, RoutedEventArgs e)
     {
-        _isUpdatingPerfmonSelection = true;
-        var visible = (PerfmonCountersList.ItemsSource as IEnumerable<SelectableItem>)?.ToList() ?? _perfmonCounterItems;
+        _isUpdatingMemoryClerkSelection = true;
+        var visible = (MemoryClerksList.ItemsSource as IEnumerable<SelectableItem>)?.ToList() ?? _memoryClerkItems;
         foreach (var item in visible) item.IsSelected = false;
-        _isUpdatingPerfmonSelection = false;
-        RefreshPerfmonListOrder();
-        _ = UpdatePerfmonChartFromPickerAsync();
+        _isUpdatingMemoryClerkSelection = false;
+        RefreshMemoryClerkListOrder();
+        _ = UpdateMemoryClerksChartFromPickerAsync();
     }
 
-    private void PerfmonCounter_CheckChanged(object sender, RoutedEventArgs e)
+    private void MemoryClerk_CheckChanged(object sender, RoutedEventArgs e)
     {
-        if (_isUpdatingPerfmonSelection) return;
-        RefreshPerfmonListOrder();
-        _ = UpdatePerfmonChartFromPickerAsync();
+        if (_isUpdatingMemoryClerkSelection) return;
+        RefreshMemoryClerkListOrder();
+        _ = UpdateMemoryClerksChartFromPickerAsync();
     }
 
-    private async System.Threading.Tasks.Task UpdatePerfmonChartFromPickerAsync()
+    private async System.Threading.Tasks.Task UpdateMemoryClerksChartFromPickerAsync()
     {
         try
         {
-            var selected = _perfmonCounterItems.Where(i => i.IsSelected).Take(12).ToList();
+            var selected = _memoryClerkItems.Where(i => i.IsSelected).Take(20).ToList();
 
-            ClearChart(PerfmonChart);
-            _perfmonHover?.Clear();
-            ApplyDarkTheme(PerfmonChart);
+            ClearChart(MemoryClerksChart);
+            ApplyDarkTheme(MemoryClerksChart);
+            _memoryClerksHover?.Clear();
 
-            if (selected.Count == 0) { PerfmonChart.Refresh(); return; }
+            if (selected.Count == 0)
+            {
+                MemoryClerksTotalText.Text = "--";
+                MemoryClerksTopText.Text = "--";
+                MemoryClerksChart.Refresh();
+                return;
+            }
 
             var hoursBack = GetHoursBack();
             DateTime? fromDate = null;
@@ -1380,42 +1849,60 @@ private async System.Threading.Tasks.Task UpdatePerfmonChartFromPickerAsync()
                     toDate = ServerTimeHelper.LocalToServerTime(toLocal.Value);
                 }
             }
+
             double globalMax = 0;
+            double nonBpTotal = 0;
+            string topNonBpClerk = "";
+            double topNonBpMb = 0;
 
             for (int i = 0; i < selected.Count; i++)
             {
-                var trend = await _dataService.GetPerfmonTrendAsync(_serverId, selected[i].DisplayName, hoursBack, fromDate, toDate);
+                var trend = await _dataService.GetMemoryClerkTrendAsync(_serverId, selected[i].DisplayName, hoursBack, fromDate, toDate);
                 if (trend.Count == 0) continue;
 
                 var times = trend.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
-                var values = trend.Select(t => (double)t.DeltaValue).ToArray();
+                var values = trend.Select(t => t.MemoryMb).ToArray();
 
-                var plot = PerfmonChart.Plot.Add.Scatter(times, values);
+                var plot = MemoryClerksChart.Plot.Add.Scatter(times, values);
                 plot.LegendText = selected[i].DisplayName;
                 plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
-                _perfmonHover?.Add(plot, selected[i].DisplayName);
+                _memoryClerksHover?.Add(plot, selected[i].DisplayName);
 
                 if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
+
+                /* Summary: use latest value, exclude buffer pool */
+                var latestMb = values.Last();
+                if (!selected[i].DisplayName.Contains("BUFFERPOOL", StringComparison.OrdinalIgnoreCase))
+                {
+                    nonBpTotal += latestMb;
+                    if (latestMb > topNonBpMb)
+                    {
+                        topNonBpMb = latestMb;
+                        topNonBpClerk = selected[i].DisplayName;
+                    }
+                }
             }
 
-            PerfmonChart.Plot.Axes.DateTimeTicksBottom();
-            DateTime rangeStart, rangeEnd;
-            if (IsCustomRange && fromDate.HasValue && toDate.HasValue)
+            MemoryClerksChart.Plot.Axes.DateTimeTicksBottom();
+            ReapplyAxisColors(MemoryClerksChart);
+            MemoryClerksChart.Plot.YLabel("Memory (MB)");
+            SetChartYLimitsWithLegendPadding(MemoryClerksChart, 0, globalMax > 0 ? globalMax : 100);
+            ShowChartLegend(MemoryClerksChart);
+            MemoryClerksChart.Refresh();
+
+            /* Update summary panel */
+            MemoryClerksTotalText.Text = nonBpTotal >= 1024 ? $"{nonBpTotal / 1024:F1} GB" : $"{nonBpTotal:N0} MB";
+            if (!string.IsNullOrEmpty(topNonBpClerk))
             {
-                rangeStart = fromDate.Value;
-                rangeEnd = toDate.Value;
+                var name = topNonBpClerk;
+                if (name.StartsWith("MEMORYCLERK_", StringComparison.OrdinalIgnoreCase))
+                    name = name.Substring(12);
+                MemoryClerksTopText.Text = topNonBpMb >= 1024 ? $"{name} ({topNonBpMb / 1024:F1} GB)" : $"{name} ({topNonBpMb:N0} MB)";
             }
             else
             {
-                rangeEnd = DateTime.UtcNow.AddMinutes(UtcOffsetMinutes);
-                rangeStart = rangeEnd.AddHours(-hoursBack);
+                MemoryClerksTopText.Text = "--";
             }
-            PerfmonChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
-            ReapplyAxisColors(PerfmonChart);
-            PerfmonChart.Plot.YLabel("Value");
-            SetChartYLimitsWithLegendPadding(PerfmonChart, 0, globalMax > 0 ? globalMax : 100);
-            ShowChartLegend(PerfmonChart);
-            PerfmonChart.Refresh();
         }
         catch
         {
@@ -1423,10 +1910,202 @@ private async System.Threading.Tasks.Task UpdatePerfmonChartFromPickerAsync()
         }
     }
 
-    /// <summary>
-    /// Clears a chart and removes any existing legend panel to prevent duplication.
-    /// </summary>
-    private void ClearChart(ScottPlot.WPF.WpfPlot chart)
+    /* ========== Perfmon Picker ========== */
+
+    private bool _isUpdatingPerfmonSelection;
+
+    private void PopulatePerfmonPicker(List<string> counters)
+    {
+        /* Initialize pack ComboBox once */
+        if (PerfmonPackCombo.Items.Count == 0)
+        {
+            PerfmonPackCombo.ItemsSource = Helpers.PerfmonPacks.PackNames;
+            PerfmonPackCombo.SelectedItem = "General Throughput";
+        }
+
+        var previouslySelected = new HashSet<string>(_perfmonCounterItems.Where(i => i.IsSelected).Select(i => i.DisplayName));
+        _perfmonCounterItems = counters.Select(c => new SelectableItem
+        {
+            DisplayName = c,
+            IsSelected = previouslySelected.Contains(c)
+                || (previouslySelected.Count == 0 && _defaultPerfmonCounters.Contains(c))
+        }).ToList();
+        RefreshPerfmonListOrder();
+    }
+
+    private void PerfmonPack_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_perfmonCounterItems == null || _perfmonCounterItems.Count == 0) return;
+        if (PerfmonPackCombo.SelectedItem is not string pack) return;
+
+        _isUpdatingPerfmonSelection = true;
+
+        /* Clear search so all counters are visible */
+        if (PerfmonSearchBox != null)
+            PerfmonSearchBox.Text = "";
+
+        /* Uncheck everything first */
+        foreach (var item in _perfmonCounterItems)
+            item.IsSelected = false;
+
+        if (pack == Helpers.PerfmonPacks.AllCounters)
+        {
+            /* "All Counters" selects the General Throughput defaults */
+            foreach (var item in _perfmonCounterItems)
+            {
+                if (_defaultPerfmonCounters.Contains(item.DisplayName))
+                    item.IsSelected = true;
+            }
+        }
+        else if (Helpers.PerfmonPacks.Packs.TryGetValue(pack, out var packCounters))
+        {
+            var packSet = new HashSet<string>(packCounters, StringComparer.OrdinalIgnoreCase);
+            int count = 0;
+            foreach (var item in _perfmonCounterItems)
+            {
+                if (count >= 12) break;
+                if (packSet.Contains(item.DisplayName))
+                {
+                    item.IsSelected = true;
+                    count++;
+                }
+            }
+        }
+
+        _isUpdatingPerfmonSelection = false;
+        RefreshPerfmonListOrder();
+        _ = UpdatePerfmonChartFromPickerAsync();
+    }
+
+    private void RefreshPerfmonListOrder()
+    {
+        if (_perfmonCounterItems == null) return;
+        _perfmonCounterItems = _perfmonCounterItems
+            .OrderByDescending(x => x.IsSelected)
+            .ThenBy(x => _perfmonCounterItems.IndexOf(x))
+            .ToList();
+        ApplyPerfmonFilter();
+    }
+
+    private void ApplyPerfmonFilter()
+    {
+        var search = PerfmonSearchBox?.Text?.Trim() ?? "";
+        PerfmonCountersList.ItemsSource = null;
+        if (string.IsNullOrEmpty(search))
+            PerfmonCountersList.ItemsSource = _perfmonCounterItems;
+        else
+            PerfmonCountersList.ItemsSource = _perfmonCounterItems.Where(i => i.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase)).ToList();
+    }
+
+    private void PerfmonSearch_TextChanged(object sender, TextChangedEventArgs e) => ApplyPerfmonFilter();
+
+    private void PerfmonSelectAll_Click(object sender, RoutedEventArgs e)
+    {
+        _isUpdatingPerfmonSelection = true;
+        var visible = (PerfmonCountersList.ItemsSource as IEnumerable<SelectableItem>)?.ToList() ?? _perfmonCounterItems;
+        int count = visible.Count(i => i.IsSelected);
+        foreach (var item in visible)
+        {
+            if (!item.IsSelected && count < 12)
+            {
+                item.IsSelected = true;
+                count++;
+            }
+        }
+        _isUpdatingPerfmonSelection = false;
+        RefreshPerfmonListOrder();
+        _ = UpdatePerfmonChartFromPickerAsync();
+    }
+
+    private void PerfmonClearAll_Click(object sender, RoutedEventArgs e)
+    {
+        _isUpdatingPerfmonSelection = true;
+        var visible = (PerfmonCountersList.ItemsSource as IEnumerable<SelectableItem>)?.ToList() ?? _perfmonCounterItems;
+        foreach (var item in visible) item.IsSelected = false;
+        _isUpdatingPerfmonSelection = false;
+        RefreshPerfmonListOrder();
+        _ = UpdatePerfmonChartFromPickerAsync();
+    }
+
+    private void PerfmonCounter_CheckChanged(object sender, RoutedEventArgs e)
+    {
+        if (_isUpdatingPerfmonSelection) return;
+        RefreshPerfmonListOrder();
+        _ = UpdatePerfmonChartFromPickerAsync();
+    }
+
+    private async System.Threading.Tasks.Task UpdatePerfmonChartFromPickerAsync()
+    {
+        try
+        {
+            var selected = _perfmonCounterItems.Where(i => i.IsSelected).Take(12).ToList();
+
+            ClearChart(PerfmonChart);
+            _perfmonHover?.Clear();
+            ApplyDarkTheme(PerfmonChart);
+
+            if (selected.Count == 0) { PerfmonChart.Refresh(); return; }
+
+            var hoursBack = GetHoursBack();
+            DateTime? fromDate = null;
+            DateTime? toDate = null;
+            if (IsCustomRange)
+            {
+                var fromLocal = GetDateTimeFromPickers(FromDatePicker!, FromHourCombo, FromMinuteCombo);
+                var toLocal = GetDateTimeFromPickers(ToDatePicker!, ToHourCombo, ToMinuteCombo);
+                if (fromLocal.HasValue && toLocal.HasValue)
+                {
+                    fromDate = ServerTimeHelper.LocalToServerTime(fromLocal.Value);
+                    toDate = ServerTimeHelper.LocalToServerTime(toLocal.Value);
+                }
+            }
+            double globalMax = 0;
+
+            for (int i = 0; i < selected.Count; i++)
+            {
+                var trend = await _dataService.GetPerfmonTrendAsync(_serverId, selected[i].DisplayName, hoursBack, fromDate, toDate);
+                if (trend.Count == 0) continue;
+
+                var times = trend.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+                var values = trend.Select(t => (double)t.DeltaValue).ToArray();
+
+                var plot = PerfmonChart.Plot.Add.Scatter(times, values);
+                plot.LegendText = selected[i].DisplayName;
+                plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
+                _perfmonHover?.Add(plot, selected[i].DisplayName);
+
+                if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
+            }
+
+            PerfmonChart.Plot.Axes.DateTimeTicksBottom();
+            DateTime rangeStart, rangeEnd;
+            if (IsCustomRange && fromDate.HasValue && toDate.HasValue)
+            {
+                rangeStart = fromDate.Value;
+                rangeEnd = toDate.Value;
+            }
+            else
+            {
+                rangeEnd = DateTime.UtcNow.AddMinutes(UtcOffsetMinutes);
+                rangeStart = rangeEnd.AddHours(-hoursBack);
+            }
+            PerfmonChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+            ReapplyAxisColors(PerfmonChart);
+            PerfmonChart.Plot.YLabel("Value");
+            SetChartYLimitsWithLegendPadding(PerfmonChart, 0, globalMax > 0 ? globalMax : 100);
+            ShowChartLegend(PerfmonChart);
+            PerfmonChart.Refresh();
+        }
+        catch
+        {
+            /* Ignore chart update errors */
+        }
+    }
+
+    /// <summary>
+    /// Clears a chart and removes any existing legend panel to prevent duplication.
+    /// </summary>
+    private void ClearChart(ScottPlot.WPF.WpfPlot chart)
     {
         if (_legendPanels.TryGetValue(chart, out var existingPanel) && existingPanel != null)
         {
@@ -1573,7 +2252,7 @@ private static string GetCellValue(DataGridColumn col, object item)
             && boundCol.Binding is System.Windows.Data.Binding binding)
         {
             var prop = item.GetType().GetProperty(binding.Path.Path);
-            return prop?.GetValue(item)?.ToString() ?? "";
+            return FormatForExport(prop?.GetValue(item));
         }
 
         /* DataGridTemplateColumn — instantiate the template and find a TextBlock binding */
@@ -1586,7 +2265,7 @@ private static string GetCellValue(DataGridColumn col, object item)
                 if (textBinding != null)
                 {
                     var prop = item.GetType().GetProperty(textBinding.Path.Path);
-                    return prop?.GetValue(item)?.ToString() ?? "";
+                    return FormatForExport(prop?.GetValue(item));
                 }
             }
         }
@@ -1594,6 +2273,14 @@ private static string GetCellValue(DataGridColumn col, object item)
         return "";
     }
 
+    private static string FormatForExport(object? value)
+    {
+        if (value == null) return "";
+        if (value is IFormattable formattable)
+            return formattable.ToString(null, System.Globalization.CultureInfo.InvariantCulture);
+        return value.ToString() ?? "";
+    }
+
     private void CopyCell_Click(object sender, RoutedEventArgs e)
     {
         if (sender is not MenuItem menuItem) return;
@@ -1630,7 +2317,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
         /* Header */
         foreach (var col in grid.Columns)
         {
-            sb.Append(col.Header?.ToString() ?? "");
+            sb.Append(Helpers.DataGridClipboardBehavior.GetHeaderText(col));
             sb.Append('\t');
         }
         sb.AppendLine();
@@ -1744,14 +2431,15 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
         if (dialog.ShowDialog() != true) return;
 
         var sb = new StringBuilder();
+        var sep = App.CsvSeparator;
 
         /* Header */
         var headers = new List<string>();
         foreach (var col in grid.Columns)
         {
-            headers.Add(CsvEscape(col.Header?.ToString() ?? ""));
+            headers.Add(CsvEscape(col.Header?.ToString() ?? "", sep));
         }
-        sb.AppendLine(string.Join(",", headers));
+        sb.AppendLine(string.Join(sep, headers));
 
         /* Rows */
         foreach (var item in grid.Items)
@@ -1759,9 +2447,9 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
             var values = new List<string>();
             foreach (var col in grid.Columns)
             {
-                values.Add(CsvEscape(GetCellValue(col, item)));
+                values.Add(CsvEscape(GetCellValue(col, item), sep));
             }
-            sb.AppendLine(string.Join(",", values));
+            sb.AppendLine(string.Join(sep, values));
         }
 
         try
@@ -1808,6 +2496,50 @@ private void QueryStoreGrid_MouseDoubleClick(object sender, System.Windows.Input
     }
 
 
+    private void CollectionHealthGrid_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        if (CollectionHealthGrid.SelectedItem is not CollectorHealthRow item) return;
+
+        var window = new Windows.CollectionLogWindow(_dataService, _serverId, item.CollectorName);
+        window.Owner = Window.GetWindow(this);
+        window.ShowDialog();
+    }
+
+    private void DailySummaryToday_Click(object sender, RoutedEventArgs e)
+    {
+        _dailySummaryDate = null;
+        DailySummaryDatePicker.SelectedDate = null;
+        DailySummaryTodayButton.FontWeight = FontWeights.Bold;
+        DailySummaryIndicator.Text = "Showing: Today (UTC)";
+        DailySummaryRefresh_Click(sender, e);
+    }
+
+    private void DailySummaryDate_Changed(object sender, SelectionChangedEventArgs e)
+    {
+        if (DailySummaryDatePicker.SelectedDate.HasValue)
+        {
+            _dailySummaryDate = DailySummaryDatePicker.SelectedDate.Value.Date;
+            DailySummaryTodayButton.FontWeight = FontWeights.Normal;
+            DailySummaryIndicator.Text = $"Showing: {_dailySummaryDate.Value:MMM d, yyyy}";
+        }
+    }
+
+    private async void DailySummaryRefresh_Click(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            var result = await _dataService.GetDailySummaryAsync(_serverId, _dailySummaryDate);
+            DailySummaryGrid.ItemsSource = result != null
+                ? new List<DailySummaryRow> { result } : null;
+            DailySummaryNoData.Visibility = result == null
+                ? Visibility.Visible : Visibility.Collapsed;
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("DailySummary", $"Error refreshing: {ex.Message}");
+        }
+    }
+
     private async void DownloadQueryStatsPlan_Click(object sender, RoutedEventArgs e)
     {
         if (sender is not Button btn || btn.DataContext is not QueryStatsRow row) return;
@@ -1817,14 +2549,36 @@ private async void DownloadQueryStatsPlan_Click(object sender, RoutedEventArgs e
         btn.Content = "...";
         try
         {
-            var connStr = _server.GetConnectionString(_credentialService);
-            var plan = await LocalDataService.FetchQueryPlanOnDemandAsync(connStr, row.QueryHash);
+            string? plan = null;
+            var source = "collected data";
+
+            // Try DuckDB first
+            try
+            {
+                plan = await _dataService.GetCachedQueryPlanAsync(_serverId, row.QueryHash);
+            }
+            catch
+            {
+                // DuckDB lookup failed, fall through to live server
+            }
+
+            // Fall back to live server
             if (string.IsNullOrEmpty(plan))
             {
-                MessageBox.Show("No query plan found in the plan cache for this query hash. The plan may have been evicted.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
+                var connStr = _server.GetConnectionString(_credentialService);
+                plan = await LocalDataService.FetchQueryPlanOnDemandAsync(connStr, row.QueryHash);
+                source = "live server";
+            }
+
+            if (string.IsNullOrEmpty(plan))
+            {
+                MessageBox.Show("No query plan found in collected data or the live plan cache for this query hash.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
+
             SavePlanFile(plan, $"QueryPlan_{row.QueryHash}");
+            btn.Content = $"Saved ({source})";
+            return;
         }
         catch (Exception ex)
         {
@@ -1832,23 +2586,442 @@ private async void DownloadQueryStatsPlan_Click(object sender, RoutedEventArgs e
         }
         finally
         {
-            btn.Content = "Save";
+            if (btn.Content is "...")
+                btn.Content = "Download";
+            btn.IsEnabled = true;
+        }
+    }
+
+    private async void DownloadProcedurePlan_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not Button btn || btn.DataContext is not ProcedureStatsRow row) return;
+        if (string.IsNullOrEmpty(row.ObjectName)) return;
+
+        btn.IsEnabled = false;
+        btn.Content = "...";
+        try
+        {
+            string? plan = null;
+            var source = "collected data";
+
+            // Try DuckDB first — match by plan_handle in query_stats
+            if (!string.IsNullOrEmpty(row.PlanHandle))
+            {
+                try
+                {
+                    plan = await _dataService.GetCachedProcedurePlanAsync(_serverId, row.PlanHandle);
+                }
+                catch
+                {
+                    // DuckDB lookup failed, fall through to live server
+                }
+            }
+
+            // Fall back to live server
+            if (string.IsNullOrEmpty(plan))
+            {
+                var connStr = _server.GetConnectionString(_credentialService);
+                plan = await LocalDataService.FetchProcedurePlanOnDemandAsync(connStr, row.DatabaseName, row.SchemaName, row.ObjectName);
+                source = "live server";
+            }
+
+            if (string.IsNullOrEmpty(plan))
+            {
+                MessageBox.Show("No query plan found in collected data or the live plan cache for this procedure.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            SavePlanFile(plan, $"ProcPlan_{row.FullName}");
+            btn.Content = $"Saved ({source})";
+            return;
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Failed to retrieve plan: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+        finally
+        {
+            if (btn.Content is "...")
+                btn.Content = "Download";
             btn.IsEnabled = true;
         }
     }
 
     private void DownloadSnapshotPlan_Click(object sender, RoutedEventArgs e)
     {
-        if (sender is not Button btn || btn.DataContext is not QuerySnapshotRow row || row.QueryPlan == null) return;
+        if (sender is not Button btn || btn.DataContext is not QuerySnapshotRow row) return;
+
+        if (row.QueryPlan == null)
+        {
+            MessageBox.Show(
+                "No estimated plan is available for this snapshot. The plan may have been evicted from the plan cache.",
+                "No Plan Available",
+                MessageBoxButton.OK,
+                MessageBoxImage.Information);
+            return;
+        }
+
         SavePlanFile(row.QueryPlan, $"EstimatedPlan_Session{row.SessionId}");
     }
 
     private void DownloadSnapshotLivePlan_Click(object sender, RoutedEventArgs e)
     {
-        if (sender is not Button btn || btn.DataContext is not QuerySnapshotRow row || row.LiveQueryPlan == null) return;
+        if (sender is not Button btn || btn.DataContext is not QuerySnapshotRow row) return;
+
+        if (row.LiveQueryPlan == null)
+        {
+            MessageBox.Show(
+                "No live query plan is available for this snapshot. The query may have completed before the plan could be captured.",
+                "No Plan Available",
+                MessageBoxButton.OK,
+                MessageBoxImage.Information);
+            return;
+        }
+
         SavePlanFile(row.LiveQueryPlan, $"ActualPlan_Session{row.SessionId}");
     }
 
+    private void ShowPlanLoading(string label)
+    {
+        PlanLoadingLabel.Text = $"Executing: {label}";
+        PlanEmptyState.Visibility = Visibility.Collapsed;
+        PlanTabControl.Visibility = Visibility.Collapsed;
+        PlanLoadingState.Visibility = Visibility.Visible;
+        PlanViewerTabItem.IsSelected = true;
+    }
+
+    private void HidePlanLoading()
+    {
+        PlanLoadingState.Visibility = Visibility.Collapsed;
+        if (PlanTabControl.Items.Count > 0)
+            PlanTabControl.Visibility = Visibility.Visible;
+        else
+            PlanEmptyState.Visibility = Visibility.Visible;
+    }
+
+    private void OpenPlanTab(string planXml, string label, string? queryText = null)
+    {
+        HidePlanLoading();
+        var viewer = new PlanViewerControl();
+        viewer.LoadPlan(planXml, label, queryText);
+
+        var header = new StackPanel { Orientation = System.Windows.Controls.Orientation.Horizontal };
+        header.Children.Add(new TextBlock
+        {
+            Text = label.Length > 30 ? label[..30] + "\u2026" : label,
+            VerticalAlignment = System.Windows.VerticalAlignment.Center,
+            ToolTip = label
+        });
+        var closeBtn = new Button
+        {
+            Style = (Style)FindResource("TabCloseButton")
+        };
+        header.Children.Add(closeBtn);
+
+        var tab = new TabItem { Header = header, Content = viewer };
+        closeBtn.Tag = tab;
+        closeBtn.Click += ClosePlanTab_Click;
+
+        PlanTabControl.Items.Add(tab);
+        PlanTabControl.SelectedItem = tab;
+        PlanEmptyState.Visibility = Visibility.Collapsed;
+        PlanTabControl.Visibility = Visibility.Visible;
+    }
+
+    private void ClosePlanTab_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button btn && btn.Tag is TabItem tab)
+        {
+            PlanTabControl.Items.Remove(tab);
+            if (PlanTabControl.Items.Count == 0)
+            {
+                PlanTabControl.Visibility = Visibility.Collapsed;
+                PlanEmptyState.Visibility = Visibility.Visible;
+            }
+        }
+    }
+
+    private void CancelPlanButton_Click(object sender, RoutedEventArgs e)
+    {
+        _actualPlanCts?.Cancel();
+    }
+
+    private async void ViewEstimatedPlan_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not MenuItem menuItem) return;
+        var grid = FindParentDataGrid(menuItem);
+        if (grid?.CurrentItem == null) return;
+
+        string? planXml = null;
+        string? queryText = null;
+        string label = "Estimated Plan";
+
+        switch (grid.CurrentItem)
+        {
+            case QuerySnapshotRow snap:
+                planXml = snap.LiveQueryPlan ?? snap.QueryPlan;
+                queryText = snap.QueryText;
+                label = snap.LiveQueryPlan != null
+                    ? $"Plan - SPID {snap.SessionId}"
+                    : $"Est Plan - SPID {snap.SessionId}";
+                break;
+            case QueryStatsRow stats:
+                planXml = stats.QueryPlan;
+                queryText = stats.QueryText;
+                label = $"Est Plan - {stats.QueryHash}";
+                // Fetch on demand if not already loaded
+                if (string.IsNullOrEmpty(planXml))
+                    planXml = await FetchPlanByHash(stats.QueryHash);
+                break;
+            case QueryStatsHistoryRow hist:
+                planXml = hist.QueryPlan;
+                label = "Est Plan - History";
+                break;
+            case ProcedureStatsRow proc:
+                label = $"Est Plan - {proc.FullName}";
+                queryText = proc.FullName;
+                try
+                {
+                    var connStr = _server.GetConnectionString(_credentialService);
+                    planXml = await LocalDataService.FetchProcedurePlanOnDemandAsync(
+                        connStr, proc.DatabaseName, proc.SchemaName, proc.ObjectName);
+                }
+                catch { }
+                break;
+            case QueryStoreRow qs:
+                label = $"Est Plan - QS {qs.QueryId}";
+                queryText = qs.QueryText;
+                if (qs.PlanId > 0)
+                {
+                    try
+                    {
+                        var connStr = _server.GetConnectionString(_credentialService);
+                        planXml = await LocalDataService.FetchQueryStorePlanAsync(connStr, qs.DatabaseName, qs.PlanId);
+                    }
+                    catch { }
+                }
+                break;
+        }
+
+        if (!string.IsNullOrEmpty(planXml))
+        {
+            OpenPlanTab(planXml, label, queryText);
+            PlanViewerTabItem.IsSelected = true;
+        }
+        else
+        {
+            MessageBox.Show(
+                "No query plan is available for this row. The plan may have been evicted from the plan cache since it was last collected.",
+                "No Plan Available",
+                MessageBoxButton.OK,
+                MessageBoxImage.Information);
+        }
+    }
+
+    private async void GetActualPlan_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not MenuItem menuItem) return;
+        var grid = FindParentDataGrid(menuItem);
+        if (grid?.CurrentItem == null) return;
+
+        string? queryText = null;
+        string? databaseName = null;
+        string? planXml = null;
+        string? isolationLevel = null;
+        string label = "Actual Plan";
+
+        switch (grid.CurrentItem)
+        {
+            case QuerySnapshotRow snapshot:
+                queryText = snapshot.QueryText;
+                databaseName = snapshot.DatabaseName;
+                planXml = snapshot.LiveQueryPlan ?? snapshot.QueryPlan;
+                isolationLevel = snapshot.TransactionIsolationLevel;
+                label = $"Actual Plan - SPID {snapshot.SessionId}";
+                break;
+            case QueryStatsRow stats:
+                queryText = stats.QueryText;
+                databaseName = stats.DatabaseName;
+                label = $"Actual Plan - {stats.QueryHash}";
+                if (!string.IsNullOrEmpty(stats.QueryHash))
+                {
+                    try { planXml = await FetchPlanByHash(stats.QueryHash); }
+                    catch { }
+                }
+                break;
+            case QueryStoreRow qs:
+                queryText = qs.QueryText;
+                databaseName = qs.DatabaseName;
+                label = $"Actual Plan - QS {qs.QueryId}";
+                if (qs.PlanId > 0)
+                {
+                    try
+                    {
+                        var connStr = _server.GetConnectionString(_credentialService);
+                        planXml = await LocalDataService.FetchQueryStorePlanAsync(connStr, qs.DatabaseName, qs.PlanId);
+                    }
+                    catch { }
+                }
+                break;
+        }
+
+        if (string.IsNullOrWhiteSpace(queryText))
+        {
+            MessageBox.Show("No query text available for this row.", "No Query Text",
+                MessageBoxButton.OK, MessageBoxImage.Warning);
+            return;
+        }
+
+        var result = MessageBox.Show(
+            $"You are about to execute this query against {_server.ServerName} in database [{databaseName ?? "default"}].\n\n" +
+            "Make sure you understand what the query does before proceeding.\n" +
+            "The query will execute with SET STATISTICS XML ON to capture the actual plan.\n" +
+            "All data results will be discarded.",
+            "Get Actual Plan",
+            MessageBoxButton.OKCancel,
+            MessageBoxImage.Warning);
+
+        if (result != MessageBoxResult.OK) return;
+
+        ShowPlanLoading(label);
+
+        _actualPlanCts?.Dispose();
+        _actualPlanCts = new CancellationTokenSource();
+
+        try
+        {
+            var connectionString = _server.GetConnectionString(_credentialService);
+
+            var actualPlanXml = await ActualPlanExecutor.ExecuteForActualPlanAsync(
+                connectionString,
+                databaseName ?? "",
+                queryText,
+                planXml,
+                isolationLevel,
+                isAzureSqlDb: false,
+                timeoutSeconds: 0,
+                _actualPlanCts.Token);
+
+            if (!string.IsNullOrEmpty(actualPlanXml))
+            {
+                OpenPlanTab(actualPlanXml, label, queryText);
+                PlanViewerTabItem.IsSelected = true;
+            }
+            else
+            {
+                MessageBox.Show("Query executed but no execution plan was captured.",
+                    "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            MessageBox.Show("The query was cancelled or timed out.",
+                "Cancelled", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Failed to get actual plan:\n\n{ex.Message}",
+                "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+        finally
+        {
+            HidePlanLoading();
+        }
+    }
+
+    private async Task<string?> FetchPlanByHash(string queryHash)
+    {
+        if (string.IsNullOrEmpty(queryHash)) return null;
+
+        // Try DuckDB cache first
+        try
+        {
+            var plan = await _dataService.GetCachedQueryPlanAsync(_serverId, queryHash);
+            if (!string.IsNullOrEmpty(plan)) return plan;
+        }
+        catch { }
+
+        // Fall back to live server
+        try
+        {
+            var connStr = _server.GetConnectionString(_credentialService);
+            return await LocalDataService.FetchQueryPlanOnDemandAsync(connStr, queryHash);
+        }
+        catch { return null; }
+    }
+
+    private async void LiveSnapshot_Click(object sender, RoutedEventArgs e)
+    {
+        LiveSnapshotButton.IsEnabled = false;
+        LiveSnapshotIndicator.Text = "Querying...";
+
+        try
+        {
+            var connectionString = _server.GetConnectionString(_credentialService);
+            var builder = new SqlConnectionStringBuilder(connectionString)
+            {
+                ConnectTimeout = 15
+            };
+
+            var query = RemoteCollectorService.BuildQuerySnapshotsQuery(supportsLiveQueryPlan: true);
+
+            await using var connection = new SqlConnection(builder.ConnectionString);
+            await connection.OpenAsync();
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 30;
+
+            using var reader = await command.ExecuteReaderAsync();
+            var results = new List<QuerySnapshotRow>();
+            var snapshotTime = DateTime.UtcNow;
+
+            while (await reader.ReadAsync())
+            {
+                results.Add(new QuerySnapshotRow
+                {
+                    SessionId = Convert.ToInt32(reader.GetValue(0)),
+                    DatabaseName = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                    ElapsedTimeFormatted = reader.IsDBNull(2) ? "" : reader.GetString(2),
+                    QueryText = reader.IsDBNull(3) ? "" : reader.GetString(3),
+                    QueryPlan = reader.IsDBNull(4) ? null : reader.GetString(4),
+                    LiveQueryPlan = reader.IsDBNull(5) ? null : reader.GetValue(5)?.ToString(),
+                    Status = reader.IsDBNull(6) ? "" : reader.GetString(6),
+                    BlockingSessionId = reader.IsDBNull(7) ? 0 : Convert.ToInt32(reader.GetValue(7)),
+                    WaitType = reader.IsDBNull(8) ? "" : reader.GetString(8),
+                    WaitTimeMs = reader.IsDBNull(9) ? 0 : Convert.ToInt64(reader.GetValue(9)),
+                    WaitResource = reader.IsDBNull(10) ? "" : reader.GetString(10),
+                    CpuTimeMs = reader.IsDBNull(11) ? 0 : Convert.ToInt64(reader.GetValue(11)),
+                    TotalElapsedTimeMs = reader.IsDBNull(12) ? 0 : Convert.ToInt64(reader.GetValue(12)),
+                    Reads = reader.IsDBNull(13) ? 0 : Convert.ToInt64(reader.GetValue(13)),
+                    Writes = reader.IsDBNull(14) ? 0 : Convert.ToInt64(reader.GetValue(14)),
+                    LogicalReads = reader.IsDBNull(15) ? 0 : Convert.ToInt64(reader.GetValue(15)),
+                    GrantedQueryMemoryGb = reader.IsDBNull(16) ? 0 : Convert.ToDouble(reader.GetValue(16)),
+                    TransactionIsolationLevel = reader.IsDBNull(17) ? "" : reader.GetString(17),
+                    Dop = reader.IsDBNull(18) ? 0 : Convert.ToInt32(reader.GetValue(18)),
+                    ParallelWorkerCount = reader.IsDBNull(19) ? 0 : Convert.ToInt32(reader.GetValue(19)),
+                    LoginName = reader.IsDBNull(20) ? "" : reader.GetString(20),
+                    HostName = reader.IsDBNull(21) ? "" : reader.GetString(21),
+                    ProgramName = reader.IsDBNull(22) ? "" : reader.GetString(22),
+                    OpenTransactionCount = reader.IsDBNull(23) ? 0 : Convert.ToInt32(reader.GetValue(23)),
+                    PercentComplete = reader.IsDBNull(24) ? 0m : Convert.ToDecimal(reader.GetValue(24)),
+                    CollectionTime = snapshotTime
+                });
+            }
+
+            _querySnapshotsFilterMgr!.UpdateData(results);
+            LiveSnapshotIndicator.Text = $"LIVE at {DateTime.Now:HH:mm:ss} ({results.Count} queries)";
+        }
+        catch (Exception ex)
+        {
+            LiveSnapshotIndicator.Text = $"Error: {ex.Message}";
+            AppLogger.Error("ServerTab", $"Live snapshot failed: {ex.Message}");
+        }
+        finally
+        {
+            LiveSnapshotButton.IsEnabled = true;
+        }
+    }
+
     private void SavePlanFile(string planXml, string defaultName)
     {
         var dialog = new SaveFileDialog
@@ -1916,9 +3089,9 @@ private void DownloadBlockedProcessXml_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    private static string CsvEscape(string value)
+    private static string CsvEscape(string value, string separator)
     {
-        if (value.Contains(',') || value.Contains('"') || value.Contains('\n') || value.Contains('\r'))
+        if (value.Contains(separator, StringComparison.Ordinal) || value.Contains('"') || value.Contains('\n') || value.Contains('\r'))
         {
             return "\"" + value.Replace("\"", "\"\"") + "\"";
         }
@@ -2095,4 +3268,18 @@ private void FilterPopup_FilterCleared(object? sender, EventArgs e)
         }
         return null;
     }
+
+    private static void SetInitialSort(DataGrid grid, string bindingPath, ListSortDirection direction)
+    {
+        foreach (var column in grid.Columns)
+        {
+            if (column is DataGridBoundColumn bc &&
+                bc.Binding is Binding b &&
+                b.Path.Path == bindingPath)
+            {
+                column.SortDirection = direction;
+                return;
+            }
+        }
+    }
 }
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index 6f912df8..57121939 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using DuckDB.NET.Data;
 using Microsoft.Extensions.Logging;
@@ -16,10 +17,58 @@ public class DuckDbInitializer
     private readonly string _databasePath;
     private readonly ILogger<DuckDbInitializer>? _logger;
 
+    /// <summary>
+    /// Coordinates UI readers with maintenance writers (CHECKPOINT, archive DELETEs, compaction).
+    /// Read locks allow unlimited concurrent UI queries. Write locks are exclusive and wait
+    /// for all readers to finish before proceeding.
+    /// </summary>
+    private static readonly ReaderWriterLockSlim s_dbLock = new(LockRecursionPolicy.NoRecursion);
+
+    /// <summary>
+    /// Acquires a read lock on the database. Multiple readers can hold this concurrently.
+    /// Dispose the returned object to release the lock.
+    /// </summary>
+    public IDisposable AcquireReadLock()
+    {
+        s_dbLock.EnterReadLock();
+        return new LockReleaser(s_dbLock, write: false);
+    }
+
+    /// <summary>
+    /// Acquires an exclusive write lock on the database. Blocks until all readers finish.
+    /// Dispose the returned object to release the lock.
+    /// </summary>
+    public IDisposable AcquireWriteLock()
+    {
+        s_dbLock.EnterWriteLock();
+        return new LockReleaser(s_dbLock, write: true);
+    }
+
+    private sealed class LockReleaser : IDisposable
+    {
+        private readonly ReaderWriterLockSlim _lock;
+        private readonly bool _write;
+        private bool _disposed;
+
+        public LockReleaser(ReaderWriterLockSlim rwLock, bool write)
+        {
+            _lock = rwLock;
+            _write = write;
+        }
+
+        public void Dispose()
+        {
+            if (_disposed) return;
+            _disposed = true;
+            if (_write) _lock.ExitWriteLock();
+            else _lock.ExitReadLock();
+        }
+    }
+
     /// <summary>
     /// Current schema version. Increment this when schema changes require table rebuilds.
     /// </summary>
-    internal const int CurrentSchemaVersion = 11;
+    internal const int CurrentSchemaVersion = 15;
 
     private readonly string _archivePath;
 
@@ -368,6 +417,61 @@ can be identified by server without needing a lookup table. */
             _logger?.LogInformation("Running migration to v11: rebuilding database_config for expanded sys.databases columns");
             await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS database_config");
         }
+
+        if (fromVersion < 12)
+        {
+            /* v12: Added login_name, host_name, program_name, open_transaction_count,
+                    percent_complete columns to query_snapshots for Issue #149. */
+            _logger?.LogInformation("Running migration to v12: adding session columns to query_snapshots");
+            try
+            {
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE query_snapshots ADD COLUMN IF NOT EXISTS login_name VARCHAR");
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE query_snapshots ADD COLUMN IF NOT EXISTS host_name VARCHAR");
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE query_snapshots ADD COLUMN IF NOT EXISTS program_name VARCHAR");
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE query_snapshots ADD COLUMN IF NOT EXISTS open_transaction_count INTEGER");
+                await ExecuteNonQueryAsync(connection, "ALTER TABLE query_snapshots ADD COLUMN IF NOT EXISTS percent_complete DECIMAL(5,2)");
+            }
+            catch
+            {
+                /* Table doesn't exist yet — will be created with correct schema below */
+            }
+        }
+
+        if (fromVersion < 13)
+        {
+            /* v13: Full column parity with Dashboard for all three query/procedure collectors.
+                    query_stats: added creation_time, last_execution_time, total_clr_time,
+                      min/max physical_reads, rows, spills, memory grant columns (6), thread columns (4).
+                    procedure_stats: added cached_time, last_execution_time,
+                      min/max logical_reads, physical_reads, logical_writes, spills.
+                    query_store_stats: complete rebuild with all min/max columns, DOP, CLR,
+                      memory, tempdb, plan forcing, compilation metrics, version-gated columns.
+                    Must drop/recreate because DuckDB appender writes by position. */
+            _logger?.LogInformation("Running migration to v13: rebuilding query_stats, procedure_stats, query_store_stats for full Dashboard column parity");
+            await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS query_stats");
+            await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS procedure_stats");
+            await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS query_store_stats");
+        }
+
+        if (fromVersion < 14)
+        {
+            /* v14: Switched memory_grant_stats from per-session (dm_exec_query_memory_grants)
+                    to semaphore-level (dm_exec_query_resource_semaphores) for parity with Dashboard.
+                    Old schema had session_id, query_text, dop, etc. New schema has
+                    resource_semaphore_id, pool_id, and delta columns.
+                    Must drop/recreate because column layout is completely different. */
+            _logger?.LogInformation("Running migration to v14: rebuilding memory_grant_stats for resource semaphore schema");
+            await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS memory_grant_stats");
+        }
+
+        if (fromVersion < 15)
+        {
+            /* v15: Added queued I/O columns (io_stall_queued_read_ms, io_stall_queued_write_ms)
+                    and their delta counterparts to file_io_stats for latency overlay charts.
+                    Must drop/recreate because DuckDB appender writes by position. */
+            _logger?.LogInformation("Running migration to v15: rebuilding file_io_stats for queued I/O columns");
+            await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS file_io_stats");
+        }
     }
 
     /// <summary>
@@ -454,7 +558,7 @@ public async Task CreateArchiveViewsAsync()
                 if (hasParquetFiles)
                 {
                     var globPath = parquetGlob.Replace("\\", "/");
-                    viewSql = $"CREATE OR REPLACE VIEW v_{table} AS SELECT * FROM {table} UNION ALL SELECT * FROM read_parquet('{globPath}', union_by_name=true)";
+                    viewSql = $"CREATE OR REPLACE VIEW v_{table} AS SELECT * FROM {table} UNION ALL BY NAME SELECT * FROM read_parquet('{globPath}', union_by_name=true)";
                 }
                 else
                 {
@@ -491,6 +595,7 @@ public async Task CreateArchiveViewsAsync()
     /// </summary>
     public async Task CheckpointAsync()
     {
+        using var writeLock = AcquireWriteLock();
         try
         {
             using var connection = CreateConnection();
@@ -546,147 +651,24 @@ public double GetDatabaseSizeMb()
     }
 
     /// <summary>
-    /// Compacts the database by exporting all tables to a fresh file and swapping.
-    /// DuckDB VACUUM does not reclaim space from append-fragmented files — only
-    /// export/reimport eliminates bloat. Typically takes 2-5 seconds for a 300MB database.
+    /// Deletes the database and WAL files, then reinitializes with fresh empty tables
+    /// and archive views pointing at the parquet files.
+    /// Acquires its own write lock — caller must NOT already hold the lock.
     /// </summary>
-    /// <returns>True if compaction was performed, false if skipped or failed.</returns>
-    public async Task<bool> CompactAsync()
+    public async Task ResetDatabaseAsync()
     {
-        if (!DatabaseExists())
-        {
-            return false;
-        }
-
-        var sizeBefore = GetDatabaseSizeMb();
-        var tempPath = _databasePath + ".compact";
-        var backupPath = _databasePath + ".precompact";
-
-        _logger?.LogInformation("Starting database compaction ({SizeMb:F0} MB)", sizeBefore);
-
-        try
-        {
-            /* Export all data to a fresh database via ATTACH + CREATE TABLE AS */
-            if (File.Exists(tempPath)) File.Delete(tempPath);
-
-            using (var connection = CreateConnection())
-            {
-                await connection.OpenAsync();
-
-                /* Checkpoint first to flush WAL */
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "CHECKPOINT";
-                    await cmd.ExecuteNonQueryAsync();
-                }
-
-                /* Attach the new database and copy all tables */
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = $"ATTACH '{tempPath.Replace("\\", "/")}' AS compact_db";
-                    await cmd.ExecuteNonQueryAsync();
-                }
+        using var writeLock = AcquireWriteLock();
 
-                /* Get all table names (exclude views) */
-                var tableNames = new List<string>();
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "SELECT table_name FROM information_schema.tables WHERE table_schema = 'main' AND table_type = 'BASE TABLE'";
-                    using var reader = await cmd.ExecuteReaderAsync();
-                    while (await reader.ReadAsync())
-                    {
-                        tableNames.Add(reader.GetString(0));
-                    }
-                }
-
-                foreach (var table in tableNames)
-                {
-                    using var cmd = connection.CreateCommand();
-                    cmd.CommandText = $"CREATE TABLE compact_db.{table} AS SELECT * FROM main.{table}";
-                    await cmd.ExecuteNonQueryAsync();
-                }
-
-                using (var cmd = connection.CreateCommand())
-                {
-                    cmd.CommandText = "DETACH compact_db";
-                    await cmd.ExecuteNonQueryAsync();
-                }
-            }
-
-            /* Delete WAL files before swap — the old WAL belongs to the pre-compaction
-               database and would confuse the fresh compacted file on next open */
-            var walPath = _databasePath + ".wal";
-            if (File.Exists(walPath)) File.Delete(walPath);
-
-            var tempWalPath = tempPath + ".wal";
-            if (File.Exists(tempWalPath)) File.Delete(tempWalPath);
-
-            /* Atomically replace the database file with the compacted version.
-               File.Replace swaps in a single OS operation, eliminating any window
-               where _databasePath doesn't exist (unlike two separate File.Move calls).
-               Retry briefly if a UI connection still has the file open. */
-            if (File.Exists(backupPath)) File.Delete(backupPath);
-
-            const int maxSwapAttempts = 3;
-            for (int attempt = 1; attempt <= maxSwapAttempts; attempt++)
-            {
-                try
-                {
-                    File.Replace(tempPath, _databasePath, backupPath);
-                    break;
-                }
-                catch (IOException) when (attempt < maxSwapAttempts)
-                {
-                    _logger?.LogDebug("Compaction file swap attempt {Attempt}/{Max} failed (file in use), retrying in 500ms",
-                        attempt, maxSwapAttempts);
-                    await Task.Delay(500);
-                }
-            }
-
-            /* Recreate indexes and views on the fresh database */
-            using (var connection = CreateConnection())
-            {
-                await connection.OpenAsync();
-
-                foreach (var indexStatement in Schema.GetAllIndexStatements())
-                {
-                    try
-                    {
-                        using var cmd = connection.CreateCommand();
-                        cmd.CommandText = indexStatement;
-                        await cmd.ExecuteNonQueryAsync();
-                    }
-                    catch { /* Index may already exist from CREATE TABLE AS */ }
-                }
-            }
-
-            await CreateArchiveViewsAsync();
-
-            /* Clean up backup */
-            File.Delete(backupPath);
-
-            var sizeAfter = GetDatabaseSizeMb();
-            _logger?.LogInformation("Compaction complete: {Before:F0} MB -> {After:F0} MB ({Saved:F0} MB reclaimed)",
-                sizeBefore, sizeAfter, sizeBefore - sizeAfter);
-
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger?.LogError(ex, "Database compaction failed");
-
-            /* Restore from backup if the primary file was moved */
-            if (!File.Exists(_databasePath) && File.Exists(backupPath))
-            {
-                File.Move(backupPath, _databasePath);
-                _logger?.LogInformation("Restored database from pre-compaction backup");
-            }
+        if (File.Exists(_databasePath))
+            File.Delete(_databasePath);
 
-            /* Clean up temp file */
-            if (File.Exists(tempPath)) File.Delete(tempPath);
+        var walPath = _databasePath + ".wal";
+        if (File.Exists(walPath))
+            File.Delete(walPath);
 
-            return false;
-        }
+        _logger?.LogInformation("Database files deleted, reinitializing");
+        await InitializeAsync();
     }
 
+
 }
diff --git a/Lite/Database/LockedConnection.cs b/Lite/Database/LockedConnection.cs
new file mode 100644
index 00000000..44e67769
--- /dev/null
+++ b/Lite/Database/LockedConnection.cs
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Threading.Tasks;
+using DuckDB.NET.Data;
+
+namespace PerformanceMonitorLite.Database;
+
+/// <summary>
+/// Wraps a DuckDBConnection with a read lock that is released when the connection is disposed.
+/// Ensures UI reads hold the lock for their entire duration, preventing CHECKPOINT or compaction
+/// from reorganizing the database file while a reader has stale file offsets.
+/// </summary>
+public sealed class LockedConnection : IDisposable, IAsyncDisposable
+{
+    private readonly DuckDBConnection _connection;
+    private readonly IDisposable _readLock;
+    private bool _disposed;
+
+    public LockedConnection(DuckDBConnection connection, IDisposable readLock)
+    {
+        _connection = connection;
+        _readLock = readLock;
+    }
+
+    /// <summary>
+    /// Creates a command on the underlying connection.
+    /// This is the only method callers need — all 50 call sites use CreateCommand() exclusively.
+    /// </summary>
+    public DuckDBCommand CreateCommand() => _connection.CreateCommand();
+
+    public void Dispose()
+    {
+        if (_disposed) return;
+        _disposed = true;
+        _connection.Dispose();
+        _readLock.Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (_disposed) return;
+        _disposed = true;
+        await _connection.DisposeAsync();
+        _readLock.Dispose();
+    }
+}
diff --git a/Lite/Database/Schema.cs b/Lite/Database/Schema.cs
index 7b3961f5..af4f3912 100644
--- a/Lite/Database/Schema.cs
+++ b/Lite/Database/Schema.cs
@@ -73,20 +73,39 @@ CREATE TABLE IF NOT EXISTS query_stats (
     database_name VARCHAR,
     query_hash VARCHAR,
     query_plan_hash VARCHAR,
+    creation_time TIMESTAMP,
+    last_execution_time TIMESTAMP,
     execution_count BIGINT,
     total_worker_time BIGINT,
     total_elapsed_time BIGINT,
     total_logical_reads BIGINT,
     total_logical_writes BIGINT,
     total_physical_reads BIGINT,
+    total_clr_time BIGINT,
     total_rows BIGINT,
     total_spills BIGINT,
     min_worker_time BIGINT,
     max_worker_time BIGINT,
     min_elapsed_time BIGINT,
     max_elapsed_time BIGINT,
+    min_physical_reads BIGINT,
+    max_physical_reads BIGINT,
+    min_rows BIGINT,
+    max_rows BIGINT,
     min_dop INTEGER,
     max_dop INTEGER,
+    min_grant_kb BIGINT,
+    max_grant_kb BIGINT,
+    min_used_grant_kb BIGINT,
+    max_used_grant_kb BIGINT,
+    min_ideal_grant_kb BIGINT,
+    max_ideal_grant_kb BIGINT,
+    min_reserved_threads BIGINT,
+    max_reserved_threads BIGINT,
+    min_used_threads BIGINT,
+    max_used_threads BIGINT,
+    min_spills BIGINT,
+    max_spills BIGINT,
     query_text VARCHAR,
     query_plan_xml VARCHAR,
     sql_handle VARCHAR,
@@ -129,12 +148,16 @@ size_mb DECIMAL(18,2),
     write_bytes BIGINT,
     io_stall_read_ms BIGINT,
     io_stall_write_ms BIGINT,
+    io_stall_queued_read_ms BIGINT,
+    io_stall_queued_write_ms BIGINT,
     delta_reads BIGINT,
     delta_writes BIGINT,
     delta_read_bytes BIGINT,
     delta_write_bytes BIGINT,
     delta_stall_read_ms BIGINT,
-    delta_stall_write_ms BIGINT
+    delta_stall_write_ms BIGINT,
+    delta_stall_queued_read_ms BIGINT,
+    delta_stall_queued_write_ms BIGINT
 )";
 
     public const string CreateMemoryStatsTable = @"
@@ -187,6 +210,8 @@ CREATE TABLE IF NOT EXISTS procedure_stats (
     schema_name VARCHAR,
     object_name VARCHAR,
     object_type VARCHAR,
+    cached_time TIMESTAMP,
+    last_execution_time TIMESTAMP,
     execution_count BIGINT,
     total_worker_time BIGINT,
     total_elapsed_time BIGINT,
@@ -197,7 +222,15 @@ CREATE TABLE IF NOT EXISTS procedure_stats (
     max_worker_time BIGINT,
     min_elapsed_time BIGINT,
     max_elapsed_time BIGINT,
+    min_logical_reads BIGINT,
+    max_logical_reads BIGINT,
+    min_physical_reads BIGINT,
+    max_physical_reads BIGINT,
+    min_logical_writes BIGINT,
+    max_logical_writes BIGINT,
     total_spills BIGINT,
+    min_spills BIGINT,
+    max_spills BIGINT,
     sql_handle VARCHAR,
     plan_handle VARCHAR,
     delta_execution_count BIGINT,
@@ -217,16 +250,55 @@ CREATE TABLE IF NOT EXISTS query_store_stats (
     database_name VARCHAR NOT NULL,
     query_id BIGINT,
     plan_id BIGINT,
+    execution_type_desc VARCHAR,
+    first_execution_time TIMESTAMP,
+    last_execution_time TIMESTAMP,
+    module_name VARCHAR,
     query_text VARCHAR,
     query_hash VARCHAR,
     execution_count BIGINT,
-    avg_duration_ms DECIMAL(18,2),
-    avg_cpu_time_ms DECIMAL(18,2),
-    avg_logical_reads DECIMAL(18,2),
-    avg_logical_writes DECIMAL(18,2),
-    avg_physical_reads DECIMAL(18,2),
-    avg_rowcount DECIMAL(18,2),
-    last_execution_time TIMESTAMP,
+    avg_duration_us BIGINT,
+    min_duration_us BIGINT,
+    max_duration_us BIGINT,
+    avg_cpu_time_us BIGINT,
+    min_cpu_time_us BIGINT,
+    max_cpu_time_us BIGINT,
+    avg_logical_io_reads BIGINT,
+    min_logical_io_reads BIGINT,
+    max_logical_io_reads BIGINT,
+    avg_logical_io_writes BIGINT,
+    min_logical_io_writes BIGINT,
+    max_logical_io_writes BIGINT,
+    avg_physical_io_reads BIGINT,
+    min_physical_io_reads BIGINT,
+    max_physical_io_reads BIGINT,
+    avg_clr_time_us BIGINT,
+    min_clr_time_us BIGINT,
+    max_clr_time_us BIGINT,
+    min_dop BIGINT,
+    max_dop BIGINT,
+    avg_query_max_used_memory BIGINT,
+    min_query_max_used_memory BIGINT,
+    max_query_max_used_memory BIGINT,
+    avg_rowcount BIGINT,
+    min_rowcount BIGINT,
+    max_rowcount BIGINT,
+    avg_num_physical_io_reads BIGINT,
+    min_num_physical_io_reads BIGINT,
+    max_num_physical_io_reads BIGINT,
+    avg_log_bytes_used BIGINT,
+    min_log_bytes_used BIGINT,
+    max_log_bytes_used BIGINT,
+    avg_tempdb_space_used BIGINT,
+    min_tempdb_space_used BIGINT,
+    max_tempdb_space_used BIGINT,
+    plan_type VARCHAR,
+    plan_forcing_type VARCHAR,
+    is_forced_plan BOOLEAN,
+    force_failure_count BIGINT,
+    last_force_failure_reason VARCHAR,
+    compatibility_level INTEGER,
+    query_plan_text VARCHAR,
     query_plan_hash VARCHAR
 )";
 
@@ -255,7 +327,12 @@ CREATE TABLE IF NOT EXISTS query_snapshots (
     granted_query_memory_gb DECIMAL(18,2),
     transaction_isolation_level VARCHAR,
     dop INTEGER,
-    parallel_worker_count INTEGER
+    parallel_worker_count INTEGER,
+    login_name VARCHAR,
+    host_name VARCHAR,
+    program_name VARCHAR,
+    open_transaction_count INTEGER,
+    percent_complete DECIMAL(5,2)
 )";
 
     public const string CreateTempdbStatsTable = @"
@@ -307,19 +384,20 @@ CREATE TABLE IF NOT EXISTS memory_grant_stats (
     collection_time TIMESTAMP NOT NULL,
     server_id INTEGER NOT NULL,
     server_name VARCHAR NOT NULL,
-    session_id INTEGER,
-    database_name VARCHAR,
-    query_text VARCHAR,
-    requested_memory_mb DECIMAL(18,2),
+    resource_semaphore_id SMALLINT,
+    pool_id INTEGER,
+    target_memory_mb DECIMAL(18,2),
+    max_target_memory_mb DECIMAL(18,2),
+    total_memory_mb DECIMAL(18,2),
+    available_memory_mb DECIMAL(18,2),
     granted_memory_mb DECIMAL(18,2),
     used_memory_mb DECIMAL(18,2),
-    max_used_memory_mb DECIMAL(18,2),
-    ideal_memory_mb DECIMAL(18,2),
-    required_memory_mb DECIMAL(18,2),
-    wait_time_ms BIGINT,
-    is_small_grant BOOLEAN,
-    dop INTEGER,
-    query_cost DECIMAL(18,2)
+    grantee_count INTEGER,
+    waiter_count INTEGER,
+    timeout_error_count BIGINT,
+    forced_grant_count BIGINT,
+    timeout_error_count_delta BIGINT,
+    forced_grant_count_delta BIGINT
 )";
 
     public const string CreateWaitingTasksTable = @"
@@ -460,6 +538,9 @@ is_optimized_locking_on BOOLEAN
     public const string CreateBlockedProcessReportsIndex = @"
 CREATE INDEX IF NOT EXISTS idx_blocked_process_reports_time ON blocked_process_reports(server_id, collection_time)";
 
+    public const string CreateMemoryClerksIndex = @"
+CREATE INDEX IF NOT EXISTS idx_memory_clerks_time ON memory_clerks(server_id, collection_time)";
+
     public const string CreateDatabaseScopedConfigTable = @"
 CREATE TABLE IF NOT EXISTS database_scoped_config (
     config_id BIGINT PRIMARY KEY,
@@ -575,6 +656,7 @@ public static IEnumerable<string> GetAllIndexStatements()
         yield return CreateMemoryGrantStatsIndex;
         yield return CreateWaitingTasksIndex;
         yield return CreateBlockedProcessReportsIndex;
+        yield return CreateMemoryClerksIndex;
         yield return CreateDatabaseScopedConfigIndex;
         yield return CreateTraceFlagsIndex;
         yield return CreateRunningJobsIndex;
diff --git a/Lite/Helpers/ContextMenuHelper.cs b/Lite/Helpers/ContextMenuHelper.cs
new file mode 100644
index 00000000..01bfe4de
--- /dev/null
+++ b/Lite/Helpers/ContextMenuHelper.cs
@@ -0,0 +1,373 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Media;
+using Microsoft.Win32;
+using ScottPlot.WPF;
+
+namespace PerformanceMonitorLite.Helpers;
+
+/// <summary>
+/// Shared context menu helpers for DataGrid copy/export and chart save/export operations.
+/// Used by standalone windows (history, collection log, manage servers, settings)
+/// and all ScottPlot chart controls.
+/// </summary>
+public static class ContextMenuHelper
+{
+    public static DataGrid? FindParentDataGrid(object sender)
+    {
+        if (sender is not MenuItem menuItem) return null;
+        var contextMenu = menuItem.Parent as ContextMenu;
+        var target = contextMenu?.PlacementTarget as FrameworkElement;
+        while (target != null && target is not DataGrid)
+        {
+            target = VisualTreeHelper.GetParent(target) as FrameworkElement;
+        }
+        return target as DataGrid;
+    }
+
+    public static string GetCellValue(DataGridColumn col, object item)
+    {
+        if (col is DataGridBoundColumn boundCol
+            && boundCol.Binding is Binding binding)
+        {
+            var prop = item.GetType().GetProperty(binding.Path.Path);
+            return FormatForExport(prop?.GetValue(item));
+        }
+
+        if (col is DataGridTemplateColumn templateCol && templateCol.CellTemplate != null)
+        {
+            var content = templateCol.CellTemplate.LoadContent();
+            if (content is TextBlock textBlock)
+            {
+                var textBinding = BindingOperations.GetBinding(textBlock, TextBlock.TextProperty);
+                if (textBinding != null)
+                {
+                    var prop = item.GetType().GetProperty(textBinding.Path.Path);
+                    return FormatForExport(prop?.GetValue(item));
+                }
+            }
+        }
+
+        return "";
+    }
+
+    public static void CopyCell(object sender)
+    {
+        var grid = FindParentDataGrid(sender);
+        if (grid?.CurrentCell.Column == null || grid.CurrentItem == null) return;
+
+        var value = GetCellValue(grid.CurrentCell.Column, grid.CurrentItem);
+        if (value.Length > 0) Clipboard.SetDataObject(value, false);
+    }
+
+    public static void CopyRow(object sender)
+    {
+        var grid = FindParentDataGrid(sender);
+        if (grid?.CurrentItem == null) return;
+
+        var sb = new StringBuilder();
+        foreach (var col in grid.Columns)
+        {
+            sb.Append(GetCellValue(col, grid.CurrentItem));
+            sb.Append('\t');
+        }
+        Clipboard.SetDataObject(sb.ToString().TrimEnd('\t'), false);
+    }
+
+    public static void CopyAllRows(object sender)
+    {
+        var grid = FindParentDataGrid(sender);
+        if (grid?.Items == null) return;
+
+        var sb = new StringBuilder();
+
+        foreach (var col in grid.Columns)
+        {
+            sb.Append(DataGridClipboardBehavior.GetHeaderText(col));
+            sb.Append('\t');
+        }
+        sb.AppendLine();
+
+        foreach (var item in grid.Items)
+        {
+            foreach (var col in grid.Columns)
+            {
+                sb.Append(GetCellValue(col, item));
+                sb.Append('\t');
+            }
+            sb.AppendLine();
+        }
+
+        Clipboard.SetDataObject(sb.ToString(), false);
+    }
+
+    public static void ExportToCsv(object sender, string defaultFilePrefix)
+    {
+        var grid = FindParentDataGrid(sender);
+        if (grid?.Items == null || grid.Items.Count == 0) return;
+
+        var dialog = new SaveFileDialog
+        {
+            Filter = "CSV files (*.csv)|*.csv|All files (*.*)|*.*",
+            DefaultExt = ".csv",
+            FileName = $"{defaultFilePrefix}_{DateTime.Now:yyyyMMdd_HHmmss}.csv"
+        };
+
+        if (dialog.ShowDialog() != true) return;
+
+        var sb = new StringBuilder();
+        var sep = App.CsvSeparator;
+
+        var headers = new List<string>();
+        foreach (var col in grid.Columns)
+        {
+            headers.Add(CsvEscape(DataGridClipboardBehavior.GetHeaderText(col), sep));
+        }
+        sb.AppendLine(string.Join(sep, headers));
+
+        foreach (var item in grid.Items)
+        {
+            var values = new List<string>();
+            foreach (var col in grid.Columns)
+            {
+                values.Add(CsvEscape(GetCellValue(col, item), sep));
+            }
+            sb.AppendLine(string.Join(sep, values));
+        }
+
+        try
+        {
+            File.WriteAllText(dialog.FileName, sb.ToString(), Encoding.UTF8);
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Failed to export: {ex.Message}", "Export Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+
+    private static string FormatForExport(object? value)
+    {
+        if (value == null) return "";
+        if (value is IFormattable formattable)
+            return formattable.ToString(null, CultureInfo.InvariantCulture);
+        return value.ToString() ?? "";
+    }
+
+    private static string CsvEscape(string value, string separator)
+    {
+        if (value.Contains(separator, StringComparison.Ordinal) || value.Contains('"') || value.Contains('\n') || value.Contains('\r'))
+        {
+            return "\"" + value.Replace("\"", "\"\"") + "\"";
+        }
+        return value;
+    }
+
+    /// <summary>
+    /// Sets up a context menu for a ScottPlot chart with standard options:
+    /// Copy Image, Save Image As, Open in New Window, Revert, Export Data to CSV.
+    /// </summary>
+    public static void SetupChartContextMenu(WpfPlot chart, string chartName, string? dataSource = null)
+    {
+        var contextMenu = new ContextMenu();
+
+        // Copy Image
+        var copyItem = new MenuItem { Header = "Copy Image", Icon = new TextBlock { Text = "\U0001f4cb" } };
+        copyItem.Click += (s, e) =>
+        {
+            var tempFile = Path.Combine(Path.GetTempPath(), $"chart_copy_{Guid.NewGuid()}.png");
+            try
+            {
+                chart.Plot.SavePng(tempFile, (int)chart.ActualWidth, (int)chart.ActualHeight);
+                var bitmap = new System.Windows.Media.Imaging.BitmapImage();
+                bitmap.BeginInit();
+                bitmap.CacheOption = System.Windows.Media.Imaging.BitmapCacheOption.OnLoad;
+                bitmap.UriSource = new Uri(tempFile);
+                bitmap.EndInit();
+                bitmap.Freeze();
+                Clipboard.SetDataObject(new DataObject(DataFormats.Bitmap, bitmap), false);
+            }
+            finally
+            {
+                if (File.Exists(tempFile)) File.Delete(tempFile);
+            }
+        };
+        contextMenu.Items.Add(copyItem);
+
+        // Save Image As
+        var saveItem = new MenuItem { Header = "Save Image As...", Icon = new TextBlock { Text = "\U0001f4be" } };
+        saveItem.Click += (s, e) =>
+        {
+            var timestamp = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss", CultureInfo.InvariantCulture);
+            var defaultFileName = $"{chartName}_{timestamp}.png";
+            var saveDialog = new SaveFileDialog
+            {
+                Filter = "PNG Image|*.png|JPEG Image|*.jpg|BMP Image|*.bmp",
+                FileName = defaultFileName,
+                DefaultExt = ".png"
+            };
+            if (saveDialog.ShowDialog() == true)
+            {
+                chart.Plot.SavePng(saveDialog.FileName, (int)chart.ActualWidth, (int)chart.ActualHeight);
+            }
+        };
+        contextMenu.Items.Add(saveItem);
+
+        // Open in New Window
+        var openWindowItem = new MenuItem { Header = "Open in New Window", Icon = new TextBlock { Text = "\U0001f5d7" } };
+        openWindowItem.Click += (s, e) =>
+        {
+            var newWindow = new Window
+            {
+                Title = chartName.Replace("_", " ", StringComparison.Ordinal),
+                Width = 800,
+                Height = 600
+            };
+            var tempFile = Path.Combine(Path.GetTempPath(), $"chart_temp_{Guid.NewGuid()}.png");
+            try
+            {
+                chart.Plot.SavePng(tempFile, 800, 600);
+                var image = new System.Windows.Controls.Image();
+                var bitmap = new System.Windows.Media.Imaging.BitmapImage();
+                bitmap.BeginInit();
+                bitmap.CacheOption = System.Windows.Media.Imaging.BitmapCacheOption.OnLoad;
+                bitmap.UriSource = new Uri(tempFile);
+                bitmap.EndInit();
+                bitmap.Freeze();
+                image.Source = bitmap;
+                newWindow.Content = image;
+            }
+            finally
+            {
+                if (File.Exists(tempFile)) File.Delete(tempFile);
+            }
+            newWindow.Show();
+        };
+        contextMenu.Items.Add(openWindowItem);
+
+        contextMenu.Items.Add(new Separator());
+
+        // Revert (Autoscale)
+        var autoscaleItem = new MenuItem { Header = "Revert (or double-click)", Icon = new TextBlock { Text = "\u21a9" } };
+        autoscaleItem.Click += (s, e) =>
+        {
+            chart.Plot.Axes.AutoScale();
+            chart.Refresh();
+        };
+        contextMenu.Items.Add(autoscaleItem);
+
+        contextMenu.Items.Add(new Separator());
+
+        // Export Data to CSV
+        var exportCsvItem = new MenuItem { Header = "Export Data to CSV...", Icon = new TextBlock { Text = "\U0001f4ca" } };
+        exportCsvItem.Click += (s, e) =>
+        {
+            var timestamp = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss", CultureInfo.InvariantCulture);
+            var defaultFileName = $"{chartName}_data_{timestamp}.csv";
+            var saveDialog = new SaveFileDialog
+            {
+                Filter = "CSV Files|*.csv|All Files|*.*",
+                FileName = defaultFileName,
+                DefaultExt = ".csv"
+            };
+            if (saveDialog.ShowDialog() == true)
+            {
+                try
+                {
+                    var sb = new StringBuilder();
+                    var sep = App.CsvSeparator;
+                    sb.AppendLine(string.Join(sep, new[] { "DateTime", "Series", "Value" }));
+
+                    var plottables = chart.Plot.GetPlottables();
+                    int seriesIndex = 1;
+                    foreach (var plottable in plottables)
+                    {
+                        if (plottable is ScottPlot.Plottables.Scatter scatter)
+                        {
+                            var seriesName = scatter.LegendText ?? $"Series{seriesIndex}";
+                            var points = scatter.Data.GetScatterPoints();
+
+                            foreach (var point in points)
+                            {
+                                var dateTime = DateTime.FromOADate(point.X);
+                                sb.AppendLine(string.Join(sep, new[]
+                                {
+                                    dateTime.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture),
+                                    CsvEscape(seriesName, sep),
+                                    point.Y.ToString(CultureInfo.InvariantCulture)
+                                }));
+                            }
+                            seriesIndex++;
+                        }
+                    }
+
+                    File.WriteAllText(saveDialog.FileName, sb.ToString(), Encoding.UTF8);
+                    MessageBox.Show($"Data exported to:\n{saveDialog.FileName}", "Export Complete", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Error exporting data:\n\n{ex.Message}", "Export Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        };
+        contextMenu.Items.Add(exportCsvItem);
+
+        // Show Data Source (if provided)
+        if (!string.IsNullOrEmpty(dataSource))
+        {
+            contextMenu.Items.Add(new Separator());
+
+            var dataSourceItem = new MenuItem { Header = "Show Data Source", Icon = new TextBlock { Text = "\u2139" } };
+            dataSourceItem.Click += (s, e) =>
+            {
+                MessageBox.Show(
+                    $"Data Source:\n\n{dataSource}",
+                    "Chart Data Source",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Information);
+            };
+            contextMenu.Items.Add(dataSourceItem);
+        }
+
+        // Disable ScottPlot's default right-click context menu handling
+        chart.UserInputProcessor.UserActionResponses.RemoveAll(r =>
+            r.GetType().Name.Contains("Context", StringComparison.Ordinal) ||
+            r.GetType().Name.Contains("RightClick", StringComparison.Ordinal) ||
+            r.GetType().Name.Contains("Menu", StringComparison.Ordinal));
+
+        // Use PreviewMouseRightButtonDown to show context menu before ScottPlot handles it
+        chart.PreviewMouseRightButtonDown += (s, e) =>
+        {
+            e.Handled = true;
+            contextMenu.PlacementTarget = chart;
+            contextMenu.Placement = PlacementMode.MousePoint;
+            contextMenu.IsOpen = true;
+        };
+
+        // Disable ScottPlot's default double-click behaviors
+        chart.UserInputProcessor.UserActionResponses.RemoveAll(r =>
+            r.GetType().Name.Contains("DoubleClick", StringComparison.Ordinal));
+
+        // Use PreviewMouseDoubleClick for revert/autoscale
+        chart.PreviewMouseDoubleClick += (s, e) =>
+        {
+            e.Handled = true;
+            chart.Plot.Axes.AutoScale();
+            chart.Refresh();
+        };
+    }
+}
diff --git a/Lite/Helpers/DataGridClipboardBehavior.cs b/Lite/Helpers/DataGridClipboardBehavior.cs
new file mode 100644
index 00000000..b01de495
--- /dev/null
+++ b/Lite/Helpers/DataGridClipboardBehavior.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace PerformanceMonitorLite.Helpers;
+
+/// <summary>
+/// Attached behavior that fixes DataGrid clipboard copy when column headers
+/// use StackPanel (e.g. filter button + text). Without this, copied headers
+/// show "System.Windows.Controls.StackPanel" instead of the column name.
+/// </summary>
+public static class DataGridClipboardBehavior
+{
+    public static readonly DependencyProperty FixHeaderCopyProperty =
+        DependencyProperty.RegisterAttached(
+            "FixHeaderCopy",
+            typeof(bool),
+            typeof(DataGridClipboardBehavior),
+            new PropertyMetadata(false, OnFixHeaderCopyChanged));
+
+    public static bool GetFixHeaderCopy(DependencyObject obj) => (bool)obj.GetValue(FixHeaderCopyProperty);
+    public static void SetFixHeaderCopy(DependencyObject obj, bool value) => obj.SetValue(FixHeaderCopyProperty, value);
+
+    private static void OnFixHeaderCopyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DataGrid grid && (bool)e.NewValue)
+        {
+            grid.CopyingRowClipboardContent += FixHeaderCopy;
+        }
+    }
+
+    /// <summary>
+    /// Extracts the display text from a DataGrid column header.
+    /// Handles StackPanel headers (filter button + TextBlock) by returning the TextBlock text.
+    /// </summary>
+    public static string GetHeaderText(DataGridColumn column)
+    {
+        if (column.Header is StackPanel sp)
+        {
+            var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+            if (tb != null) return tb.Text;
+        }
+        return column.Header?.ToString() ?? "";
+    }
+
+    /// <summary>
+    /// Event handler that can be wired directly to DataGrid.CopyingRowClipboardContent.
+    /// </summary>
+    public static void FixHeaderCopy(object? sender, DataGridRowClipboardEventArgs e)
+    {
+        if (!e.IsColumnHeadersRow) return;
+
+        for (int i = 0; i < e.ClipboardRowContent.Count; i++)
+        {
+            var cell = e.ClipboardRowContent[i];
+            if (cell.Column?.Header is StackPanel sp)
+            {
+                var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+                if (tb != null)
+                {
+                    e.ClipboardRowContent[i] = new DataGridClipboardCellContent(cell.Item, cell.Column, tb.Text);
+                }
+            }
+        }
+    }
+}
diff --git a/Lite/Helpers/PerfmonPacks.cs b/Lite/Helpers/PerfmonPacks.cs
new file mode 100644
index 00000000..e6923dd7
--- /dev/null
+++ b/Lite/Helpers/PerfmonPacks.cs
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Collections.Generic;
+
+namespace PerformanceMonitorLite.Helpers;
+
+public static class PerfmonPacks
+{
+    public const string AllCounters = "All Counters";
+
+    public static readonly string[] PackNames =
+    [
+        AllCounters,
+        "General Throughput",
+        "Memory Pressure",
+        "CPU / Compilation",
+        "I/O Pressure",
+        "TempDB Pressure",
+        "Lock / Blocking",
+    ];
+
+    public static readonly Dictionary<string, string[]> Packs = new()
+    {
+        ["General Throughput"] =
+        [
+            "Batch Requests/sec",
+            "SQL Compilations/sec",
+            "SQL Re-Compilations/sec",
+            "Query optimizations/sec",
+            "Network IO waits",
+        ],
+        ["Memory Pressure"] =
+        [
+            "Memory Grants Pending",
+            "Granted Workspace Memory (KB)",
+            "Target Server Memory (KB)",
+            "Total Server Memory (KB)",
+            "Stolen Server Memory (KB)",
+            "Lock Memory (KB)",
+            "SQL Cache Memory (KB)",
+            "Lazy writes/sec",
+            "Free list stalls/sec",
+            "Reduced memory grants/sec",
+            "Memory grant queue waits",
+            "Thread-safe memory objects waits",
+            "Page reads/sec",
+            "Readahead pages/sec",
+        ],
+        ["CPU / Compilation"] =
+        [
+            "Batch Requests/sec",
+            "SQL Compilations/sec",
+            "SQL Re-Compilations/sec",
+            "Query optimizations/sec",
+            "Active parallel threads",
+            "Active requests",
+            "Queued requests",
+            "Wait for the worker",
+        ],
+        ["I/O Pressure"] =
+        [
+            "Page reads/sec",
+            "Page writes/sec",
+            "Checkpoint pages/sec",
+            "Page lookups/sec",
+            "Readahead pages/sec",
+            "Background writer pages/sec",
+            "Log Flushes/sec",
+            "Log Bytes Flushed/sec",
+            "Log Flush Write Time (ms)",
+            "Page IO latch waits",
+            "Log buffer waits",
+            "Log write waits",
+            "Full Scans/sec",
+            "Index Searches/sec",
+            "Page Splits/sec",
+        ],
+        ["TempDB Pressure"] =
+        [
+            "Version Store Size (KB)",
+            "Free Space in tempdb (KB)",
+            "Active Temp Tables",
+            "Version Generation rate (KB/s)",
+            "Version Cleanup rate (KB/s)",
+            "Temp Tables Creation Rate",
+            "Workfiles Created/sec",
+            "Worktables Created/sec",
+        ],
+        ["Lock / Blocking"] =
+        [
+            "Lock Requests/sec",
+            "Lock Wait Time (ms)",
+            "Lock Waits/sec",
+            "Number of Deadlocks/sec",
+            "Table Lock Escalations/sec",
+            "Blocked tasks",
+            "Lock waits",
+            "Non-Page latch waits",
+            "Page latch waits",
+            "Processes blocked",
+            "Lock Timeouts/sec",
+        ],
+    };
+}
diff --git a/Lite/MainWindow.xaml b/Lite/MainWindow.xaml
index 9f257c26..6826ebab 100644
--- a/Lite/MainWindow.xaml
+++ b/Lite/MainWindow.xaml
@@ -275,11 +275,11 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Grid.Column="0" x:Name="StatusText" Text="Ready" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center"/>
-                    <TextBlock Grid.Column="1" x:Name="CollectorHealthText" Text="" Foreground="{DynamicResource ForegroundMutedBrush}" Margin="16,0" VerticalAlignment="Center"/>
-                    <TextBlock Grid.Column="2" x:Name="DatabaseSizeText" Text="Database: --" Foreground="{DynamicResource ForegroundMutedBrush}" Margin="16,0" VerticalAlignment="Center"/>
-                    <TextBlock Grid.Column="3" x:Name="CollectionStatusText" Text="Collection: Stopped" Foreground="{DynamicResource ForegroundMutedBrush}" Margin="16,0" VerticalAlignment="Center"/>
-                    <TextBlock Grid.Column="4" x:Name="ServerCountText" Text="Servers: 0" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="0" x:Name="StatusText" Text="Ready" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="1" x:Name="CollectorHealthText" Text="" Foreground="{DynamicResource ForegroundBrush}" Margin="16,0" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="2" x:Name="DatabaseSizeText" Text="Database: --" Foreground="{DynamicResource ForegroundBrush}" Margin="16,0" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="3" x:Name="CollectionStatusText" Text="Collection: Stopped" Foreground="{DynamicResource ForegroundBrush}" Margin="16,0" VerticalAlignment="Center"/>
+                    <TextBlock Grid.Column="4" x:Name="ServerCountText" Text="Servers: 0" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
                 </Grid>
             </Border>
         </Grid>
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index e1aed234..0c8427d6 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -62,10 +62,10 @@ public MainWindow()
     {
         InitializeComponent();
 
-        // Initialize services
-        _databaseInitializer = new DuckDbInitializer(App.DatabasePath);
+        // Initialize services (with loggers wired to AppLogger)
+        _databaseInitializer = new DuckDbInitializer(App.DatabasePath, new AppLoggerAdapter<DuckDbInitializer>());
         _emailAlertService = new EmailAlertService(_databaseInitializer);
-        _serverManager = new ServerManager(App.ConfigDirectory);
+        _serverManager = new ServerManager(App.ConfigDirectory, logger: new AppLoggerAdapter<ServerManager>());
         _scheduleManager = new ScheduleManager(App.ConfigDirectory);
 
         // Status bar update timer
@@ -96,16 +96,19 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             // Initialize the DuckDB database
             await _databaseInitializer.InitializeAsync();
 
-            // Initialize the collection engine
+            // Initialize the collection engine (with loggers wired to AppLogger)
             _collectorService = new RemoteCollectorService(
                 _databaseInitializer,
                 _serverManager,
-                _scheduleManager);
+                _scheduleManager,
+                new AppLoggerAdapter<RemoteCollectorService>());
 
-            var archiveService = new ArchiveService(_databaseInitializer, App.ArchiveDirectory);
-            var retentionService = new RetentionService(App.ArchiveDirectory);
+            var archiveService = new ArchiveService(_databaseInitializer, App.ArchiveDirectory, new AppLoggerAdapter<ArchiveService>());
+            var retentionService = new RetentionService(App.ArchiveDirectory, new AppLoggerAdapter<RetentionService>());
 
-            _backgroundService = new CollectionBackgroundService(_collectorService, _databaseInitializer, archiveService, retentionService, _serverManager);
+            _backgroundService = new CollectionBackgroundService(
+                _collectorService, _databaseInitializer, archiveService, retentionService, _serverManager,
+                new AppLoggerAdapter<CollectionBackgroundService>());
 
             // Start background collection
             _backgroundCts = new CancellationTokenSource();
@@ -351,7 +354,7 @@ private void UpdateCollectorHealth()
         else
         {
             CollectorHealthText.Text = $"Collectors: {health.TotalCollectors} OK";
-            CollectorHealthText.Foreground = (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
+            CollectorHealthText.Foreground = (System.Windows.Media.Brush)FindResource("ForegroundBrush");
             CollectorHealthText.ToolTip = null;
         }
     }
diff --git a/Lite/Mcp/McpMemoryTools.cs b/Lite/Mcp/McpMemoryTools.cs
index c485b72d..920797a8 100644
--- a/Lite/Mcp/McpMemoryTools.cs
+++ b/Lite/Mcp/McpMemoryTools.cs
@@ -124,13 +124,12 @@ public static async Task<string> GetMemoryClerks(
         }
     }
 
-    [McpServerTool(Name = "get_memory_grants"), Description("Gets recently captured memory grants — queries that were granted or waiting for workspace memory at collection time. Shows requested vs granted vs used memory, wait times, and query text. High wait times or large gaps between granted and used memory indicate inefficient grants or memory pressure.")]
+    [McpServerTool(Name = "get_memory_grants"), Description("Gets resource semaphore statistics showing granted vs available workspace memory per resource pool, waiter counts, and timeout/forced grant deltas. High waiter counts or rising timeout deltas indicate memory grant pressure affecting query performance.")]
     public static async Task<string> GetMemoryGrants(
         LocalDataService dataService,
         ServerManager serverManager,
         [Description("Server name or display name.")] string? server_name = null,
-        [Description("Hours of history. Default 1.")] int hours_back = 1,
-        [Description("Maximum rows. Default 20.")] int limit = 20)
+        [Description("Hours of history. Default 1.")] int hours_back = 1)
     {
         var resolved = ServerResolver.Resolve(serverManager, server_name);
         if (resolved == null)
@@ -143,33 +142,32 @@ public static async Task<string> GetMemoryGrants(
             var hoursError = McpHelpers.ValidateHoursBack(hours_back);
             if (hoursError != null) return hoursError;
 
-            var limitError = McpHelpers.ValidateTop(limit);
-            if (limitError != null) return limitError;
+            var rows = await dataService.GetMemoryGrantChartDataAsync(resolved.Value.ServerId, hours_back);
+            if (rows.Count == 0)
+            {
+                return "No memory grant data available.";
+            }
 
-            var rows = await dataService.GetMemoryGrantStatsAsync(resolved.Value.ServerId, hours_back);
-            var result = rows.Take(limit).Select(r => new
+            /* Return latest snapshot */
+            var latestTime = rows.Max(r => r.CollectionTime);
+            var latest = rows.Where(r => r.CollectionTime == latestTime);
+
+            var result = latest.Select(r => new
             {
                 collection_time = r.CollectionTime.ToString("o"),
-                session_id = r.SessionId,
-                database_name = r.DatabaseName,
-                requested_memory_mb = Math.Round(r.RequestedMemoryMb, 2),
+                pool_id = r.PoolId,
+                available_memory_mb = Math.Round(r.AvailableMemoryMb, 2),
                 granted_memory_mb = Math.Round(r.GrantedMemoryMb, 2),
                 used_memory_mb = Math.Round(r.UsedMemoryMb, 2),
-                max_used_memory_mb = Math.Round(r.MaxUsedMemoryMb, 2),
-                ideal_memory_mb = Math.Round(r.IdealMemoryMb, 2),
-                required_memory_mb = Math.Round(r.RequiredMemoryMb, 2),
-                grant_efficiency_pct = r.GrantedMemoryMb > 0 ? Math.Round(r.MaxUsedMemoryMb / r.GrantedMemoryMb * 100, 1) : 0,
-                wait_time_ms = r.WaitTimeMs,
-                is_small_grant = r.IsSmallGrant,
-                dop = r.Dop,
-                query_cost = Math.Round(r.QueryCost, 2),
-                query_text = McpHelpers.Truncate(r.QueryText, 2000)
+                grantee_count = r.GranteeCount,
+                waiter_count = r.WaiterCount,
+                timeout_error_count_delta = r.TimeoutErrorCountDelta,
+                forced_grant_count_delta = r.ForcedGrantCountDelta
             });
 
             return JsonSerializer.Serialize(new
             {
                 server = resolved.Value.ServerName,
-                hours_back,
                 grants = result
             }, McpHelpers.JsonOptions);
         }
diff --git a/Lite/Models/PlanModels.cs b/Lite/Models/PlanModels.cs
new file mode 100644
index 00000000..2da98c8c
--- /dev/null
+++ b/Lite/Models/PlanModels.cs
@@ -0,0 +1,515 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PerformanceMonitorLite.Models;
+
+public class ParsedPlan
+{
+    public string RawXml { get; set; } = "";
+    public string? BuildVersion { get; set; }
+    public string? Build { get; set; }
+    public bool ClusteredMode { get; set; }
+    public List<PlanBatch> Batches { get; set; } = new();
+
+    public List<MissingIndex> AllMissingIndexes => Batches
+        .SelectMany(b => b.Statements)
+        .SelectMany(s => s.MissingIndexes)
+        .ToList();
+}
+
+public class PlanBatch
+{
+    public List<PlanStatement> Statements { get; set; } = new();
+}
+
+public class PlanStatement
+{
+    public string StatementText { get; set; } = "";
+    public string StatementType { get; set; } = "";
+    public double StatementSubTreeCost { get; set; }
+    public double StatementEstRows { get; set; }
+    public PlanNode? RootNode { get; set; }
+    public List<MissingIndex> MissingIndexes { get; set; } = new();
+    public MemoryGrantInfo? MemoryGrant { get; set; }
+
+    // Statement-level metadata
+    public int CardinalityEstimationModelVersion { get; set; }
+    public long CompileTimeMs { get; set; }
+    public long CompileMemoryKB { get; set; }
+    public long CompileCPUMs { get; set; }
+    public string? NonParallelPlanReason { get; set; }
+    public string? QueryHash { get; set; }
+    public string? QueryPlanHash { get; set; }
+    public long CachedPlanSizeKB { get; set; }
+    public int DegreeOfParallelism { get; set; }
+    public bool RetrievedFromCache { get; set; }
+
+    // Additional StmtSimple attributes
+    public string? StatementOptmLevel { get; set; }
+    public string? StatementOptmEarlyAbortReason { get; set; }
+    public int StatementParameterizationType { get; set; }
+    public string? StatementSqlHandle { get; set; }
+    public long DatabaseContextSettingsId { get; set; }
+    public int ParentObjectId { get; set; }
+    public bool SecurityPolicyApplied { get; set; }
+    public bool BatchModeOnRowStoreUsed { get; set; }
+
+    // QueryPlan sub-elements
+    public OptimizerHardwareInfo? HardwareProperties { get; set; }
+    public List<OptimizerStatsUsageItem> StatsUsage { get; set; } = new();
+    public ThreadStatInfo? ThreadStats { get; set; }
+    public SetOptionsInfo? SetOptions { get; set; }
+    public List<PlanParameter> Parameters { get; set; } = new();
+    public List<WaitStatInfo> WaitStats { get; set; } = new();
+    public QueryTimeInfo? QueryTimeStats { get; set; }
+
+    // Wave 2: MaxQueryMemory + QueryPlan-level warnings
+    public long MaxQueryMemoryKB { get; set; }
+    public List<PlanWarning> PlanWarnings { get; set; } = new();
+
+    // Wave 3: DOP feedback, plan guide, parameterized text, QS hints, trace flags, indexed views
+    public int EffectiveDOP { get; set; }
+    public string? DOPFeedbackAdjusted { get; set; }
+    public string? PlanGuideDB { get; set; }
+    public string? PlanGuideName { get; set; }
+    public bool UsePlan { get; set; }
+    public string? ParameterizedText { get; set; }
+    public int QueryStoreStatementHintId { get; set; }
+    public string? QueryStoreStatementHintText { get; set; }
+    public string? QueryStoreStatementHintSource { get; set; }
+    public List<TraceFlagInfo> TraceFlags { get; set; } = new();
+    public List<string> IndexedViews { get; set; } = new();
+
+    // Wave 4: Cursor plan metadata
+    public string? CursorName { get; set; }
+    public string? CursorActualType { get; set; }
+    public string? CursorRequestedType { get; set; }
+    public string? CursorConcurrency { get; set; }
+    public bool CursorForwardOnly { get; set; }
+
+    // XSD gap: Statement-level identifiers
+    public int StatementId { get; set; }
+    public int StatementCompId { get; set; }
+
+    // XSD gap: Template plan guide
+    public string? TemplatePlanGuideDB { get; set; }
+    public string? TemplatePlanGuideName { get; set; }
+
+    // XSD gap: Handle attributes
+    public string? ParameterizedPlanHandle { get; set; }
+    public string? BatchSqlHandle { get; set; }
+
+    // XSD gap: Feature flags
+    public bool ContainsLedgerTables { get; set; }
+    public bool ContainsInterleavedExecutionCandidates { get; set; }
+    public bool ContainsInlineScalarTsqlUdfs { get; set; }
+
+    // XSD gap: QueryPlan metadata
+    public int QueryVariantID { get; set; }
+    public string? DispatcherPlanHandle { get; set; }
+    public bool ExclusiveProfileTimeActive { get; set; }
+    public string? OptimizationReplayScript { get; set; }
+
+    // XSD gap: BaseStmtInfoType
+    public int QueryCompilationReplay { get; set; }
+
+    // XSD gap: QueryTimeStats UDF totals (statement-level, separate from per-node)
+    public long QueryUdfCpuTimeMs { get; set; }
+    public long QueryUdfElapsedTimeMs { get; set; }
+
+    // XSD gap: CardinalityFeedback
+    public List<CardinalityFeedbackEntry> CardinalityFeedback { get; set; } = new();
+
+    // XSD gap: Dispatcher/PSP
+    public DispatcherInfo? Dispatcher { get; set; }
+
+    // XSD gap: UDF/StoredProc sub-plans
+    public List<FunctionPlanInfo> UdfPlans { get; set; } = new();
+    public FunctionPlanInfo? StoredProcPlan { get; set; }
+}
+
+public class PlanNode
+{
+    // Identity
+    public int NodeId { get; set; }
+    public string PhysicalOp { get; set; } = "";
+    public string LogicalOp { get; set; } = "";
+
+    // Cost metrics
+    public double EstimatedTotalSubtreeCost { get; set; }
+    public double EstimatedOperatorCost { get; set; }
+    public double EstimateRows { get; set; }
+    public double EstimateIO { get; set; }
+    public double EstimateCPU { get; set; }
+    public double EstimateRebinds { get; set; }
+    public double EstimateRewinds { get; set; }
+    public int EstimatedRowSize { get; set; }
+
+    // Actual runtime stats (0 if estimated plan only)
+    public long ActualRows { get; set; }
+    public long ActualExecutions { get; set; }
+    public long ActualRowsRead { get; set; }
+    public long ActualRebinds { get; set; }
+    public long ActualRewinds { get; set; }
+    public long ActualElapsedMs { get; set; }
+    public long ActualCPUMs { get; set; }
+    public long ActualLogicalReads { get; set; }
+    public long ActualPhysicalReads { get; set; }
+    public bool HasActualStats { get; set; }
+
+    // Parallelism
+    public bool Parallel { get; set; }
+    public int EstimatedDOP { get; set; }
+    public string? ExecutionMode { get; set; }
+
+    // Display
+    public string IconName { get; set; } = "iterator_catch_all";
+    public int CostPercent { get; set; }
+    public bool IsExpensive => CostPercent >= 25;
+
+    // Detail properties (for tooltip/properties panel)
+    public string? DatabaseName { get; set; }
+    public string? ObjectName { get; set; }
+    public string? FullObjectName { get; set; }
+    public string? IndexName { get; set; }
+    public string? SeekPredicates { get; set; }
+    public string? Predicate { get; set; }
+    public string? HashKeysProbe { get; set; }
+    public string? HashKeysBuild { get; set; }
+    public string? BuildResidual { get; set; }
+    public string? ProbeResidual { get; set; }
+    public string? OutputColumns { get; set; }
+    public bool Ordered { get; set; }
+    public string? PartitioningType { get; set; }
+    public string? StorageType { get; set; }
+
+    // RelOp-level properties (from <RelOp> element per XSD)
+    public bool Partitioned { get; set; }
+    public bool IsAdaptive { get; set; }
+    public double AdaptiveThresholdRows { get; set; }
+    public string? EstimatedJoinType { get; set; }
+    public string? ActualJoinType { get; set; }
+    public string? ActualExecutionMode { get; set; }
+
+    // Scan/Seek properties (IndexScanType / TableScanType)
+    public string? ScanDirection { get; set; }
+    public bool ForcedIndex { get; set; }
+    public bool ForceScan { get; set; }
+    public bool ForceSeek { get; set; }
+    public bool NoExpandHint { get; set; }
+    public bool Lookup { get; set; }
+    public bool DynamicSeek { get; set; }
+
+    // Operator-specific properties
+    public string? OrderBy { get; set; }
+    public string? OuterReferences { get; set; }
+    public string? InnerSideJoinColumns { get; set; }
+    public string? OuterSideJoinColumns { get; set; }
+    public string? GroupBy { get; set; }
+    public string? PartitionColumns { get; set; }
+    public string? DefinedValues { get; set; }
+    public double TableCardinality { get; set; }
+    public double EstimatedRowsRead { get; set; }
+    public string? TopExpression { get; set; }
+    public bool IsPercent { get; set; }
+    public bool WithTies { get; set; }
+    public bool ManyToMany { get; set; }
+    public bool BitmapCreator { get; set; }
+    public string? SetPredicate { get; set; }
+    public string? SegmentColumn { get; set; }
+    public bool SortDistinct { get; set; }
+    public bool StartupExpression { get; set; }
+
+    // Nested Loops properties
+    public bool NLOptimized { get; set; }
+    public bool WithOrderedPrefetch { get; set; }
+    public bool WithUnorderedPrefetch { get; set; }
+
+    // Parallelism properties
+    public bool Remoting { get; set; }
+    public bool LocalParallelism { get; set; }
+
+    // Extended actual I/O stats
+    public long ActualScans { get; set; }
+    public long ActualReadAheads { get; set; }
+    public long ActualLobLogicalReads { get; set; }
+    public long ActualLobPhysicalReads { get; set; }
+    public long ActualLobReadAheads { get; set; }
+
+    // Memory
+    public long? MemoryGrantKB { get; set; }
+    public long? DesiredMemoryKB { get; set; }
+    public long? MaxUsedMemoryKB { get; set; }
+
+    // Warnings
+    public List<PlanWarning> Warnings { get; set; } = new();
+    public bool HasWarnings => Warnings.Count > 0;
+
+    // Tree structure
+    public List<PlanNode> Children { get; set; } = new();
+    public PlanNode? Parent { get; set; }
+
+    // Layout coordinates (set by layout engine)
+    public double X { get; set; }
+    public double Y { get; set; }
+
+    // Wave 2: Merge/NL residual + pass-thru, parallelism hash keys, Top extras
+    public string? MergeResidual { get; set; }
+    public string? PassThru { get; set; }
+    public string? HashKeys { get; set; }
+    public string? OffsetExpression { get; set; }
+    public bool RowCount { get; set; }
+    public int TopRows { get; set; }
+
+    // Wave 3: MemoryFractions, RunTimePartitionSummary, Spool, Update DML, Columnstore, UDF
+    public double MemoryFractionInput { get; set; }
+    public double MemoryFractionOutput { get; set; }
+    public int PartitionsAccessed { get; set; }
+    public string? PartitionRanges { get; set; }
+    public bool SpoolStack { get; set; }
+    public int PrimaryNodeId { get; set; }
+    public bool DMLRequestSort { get; set; }
+    public string? ActionColumn { get; set; }
+    public long ActualSegmentReads { get; set; }
+    public long ActualSegmentSkips { get; set; }
+    public long UdfCpuTimeUs { get; set; }
+    public long UdfElapsedTimeUs { get; set; }
+
+    // XSD gap: RelOp-level metadata
+    public bool GroupExecuted { get; set; }
+    public bool RemoteDataAccess { get; set; }
+    public bool OptimizedHalloweenProtectionUsed { get; set; }
+    public long StatsCollectionId { get; set; }
+
+    // XSD gap: Object metadata
+    public string? ServerName { get; set; }
+    public string? ObjectAlias { get; set; }
+    public string? IndexKind { get; set; }
+    public bool FilteredIndex { get; set; }
+    public int TableReferenceId { get; set; }
+
+    // XSD gap: Per-thread runtime data
+    public List<PerThreadRuntimeInfo> PerThreadStats { get; set; } = new();
+
+    // XSD gap: Operator-level properties
+    public int ForceSeekColumnCount { get; set; }
+    public string? PartitionId { get; set; }
+    public bool IsStarJoin { get; set; }
+    public string? StarJoinOperationType { get; set; }
+    public string? ProbeColumn { get; set; }
+    public bool InRow { get; set; }
+    public bool ComputeSequence { get; set; }
+    public int RollupHighestLevel { get; set; }
+    public List<int> RollupLevels { get; set; } = new();
+    public string? TvfParameters { get; set; }
+    public string? OriginalActionColumn { get; set; }
+    public List<ScalarUdfReference> ScalarUdfs { get; set; } = new();
+    public string? TieColumns { get; set; }
+    public string? UdxName { get; set; }
+    public List<string> OperatorIndexedViews { get; set; } = new();
+    public List<NamedParameterInfo> NamedParameters { get; set; } = new();
+
+    // Eager spool index suggestion
+    public string? SuggestedIndex { get; set; }
+
+    // Remote operator metadata
+    public string? RemoteDestination { get; set; }
+    public string? RemoteSource { get; set; }
+    public string? RemoteObject { get; set; }
+    public string? RemoteQuery { get; set; }
+}
+
+public class MissingIndex
+{
+    public string Database { get; set; } = "";
+    public string Schema { get; set; } = "";
+    public string Table { get; set; } = "";
+    public double Impact { get; set; }
+    public List<string> EqualityColumns { get; set; } = new();
+    public List<string> InequalityColumns { get; set; } = new();
+    public List<string> IncludeColumns { get; set; } = new();
+    public string CreateStatement { get; set; } = "";
+}
+
+public class PlanWarning
+{
+    public string WarningType { get; set; } = "";
+    public string Message { get; set; } = "";
+    public PlanWarningSeverity Severity { get; set; }
+    public SpillDetail? SpillDetails { get; set; }
+}
+
+public enum PlanWarningSeverity { Info, Warning, Critical }
+
+public class MemoryGrantInfo
+{
+    public long SerialRequiredMemoryKB { get; set; }
+    public long SerialDesiredMemoryKB { get; set; }
+    public long RequiredMemoryKB { get; set; }
+    public long DesiredMemoryKB { get; set; }
+    public long RequestedMemoryKB { get; set; }
+    public long GrantedMemoryKB { get; set; }
+    public long MaxUsedMemoryKB { get; set; }
+    public long GrantWaitTimeMs { get; set; }
+    public long LastRequestedMemoryKB { get; set; }
+    public string? IsMemoryGrantFeedbackAdjusted { get; set; }
+}
+
+public class OptimizerHardwareInfo
+{
+    public long EstimatedAvailableMemoryGrant { get; set; }
+    public long EstimatedPagesCached { get; set; }
+    public int EstimatedAvailableDOP { get; set; }
+    public long MaxCompileMemory { get; set; }
+}
+
+public class OptimizerStatsUsageItem
+{
+    public string StatisticsName { get; set; } = "";
+    public string TableName { get; set; } = "";
+    public string? DatabaseName { get; set; }
+    public string? SchemaName { get; set; }
+    public long ModificationCount { get; set; }
+    public double SamplingPercent { get; set; }
+    public string? LastUpdate { get; set; }
+}
+
+public class ThreadStatInfo
+{
+    public int Branches { get; set; }
+    public int UsedThreads { get; set; }
+    public List<ThreadReservation> Reservations { get; set; } = new();
+}
+
+public class SetOptionsInfo
+{
+    public bool AnsiNulls { get; set; }
+    public bool AnsiPadding { get; set; }
+    public bool AnsiWarnings { get; set; }
+    public bool ArithAbort { get; set; }
+    public bool ConcatNullYieldsNull { get; set; }
+    public bool NumericRoundAbort { get; set; }
+    public bool QuotedIdentifier { get; set; }
+}
+
+public class PlanParameter
+{
+    public string Name { get; set; } = "";
+    public string DataType { get; set; } = "";
+    public string? CompiledValue { get; set; }
+    public string? RuntimeValue { get; set; }
+}
+
+public class WaitStatInfo
+{
+    public string WaitType { get; set; } = "";
+    public long WaitTimeMs { get; set; }
+    public long WaitCount { get; set; }
+}
+
+public class QueryTimeInfo
+{
+    public long CpuTimeMs { get; set; }
+    public long ElapsedTimeMs { get; set; }
+}
+
+public class TraceFlagInfo
+{
+    public int Value { get; set; }
+    public string Scope { get; set; } = "";
+    public bool IsCompileTime { get; set; }
+}
+
+public class CardinalityFeedbackEntry
+{
+    public long Key { get; set; }
+    public long Value { get; set; }
+}
+
+public class ThreadReservation
+{
+    public int NodeId { get; set; }
+    public int ReservedThreads { get; set; }
+}
+
+public class DispatcherInfo
+{
+    public List<ParameterSensitivePredicateInfo> ParameterSensitivePredicates { get; set; } = new();
+    public List<OptionalParameterPredicateInfo> OptionalParameterPredicates { get; set; } = new();
+}
+
+public class OptionalParameterPredicateInfo
+{
+    public string? PredicateText { get; set; }
+}
+
+public class ParameterSensitivePredicateInfo
+{
+    public double LowBoundary { get; set; }
+    public double HighBoundary { get; set; }
+    public string? PredicateText { get; set; }
+    public List<OptimizerStatsUsageItem> Statistics { get; set; } = new();
+}
+
+public class FunctionPlanInfo
+{
+    public string ProcName { get; set; } = "";
+    public bool IsNativelyCompiled { get; set; }
+    public List<PlanStatement> Statements { get; set; } = new();
+}
+
+public class PerThreadRuntimeInfo
+{
+    public int ThreadId { get; set; }
+    public long ActualRows { get; set; }
+    public long ActualExecutions { get; set; }
+    public long ActualElapsedMs { get; set; }
+    public long ActualCPUMs { get; set; }
+    public long ActualRowsRead { get; set; }
+    public long ActualLogicalReads { get; set; }
+    public long ActualPhysicalReads { get; set; }
+    public long ActualScans { get; set; }
+    public long ActualReadAheads { get; set; }
+    // Timing metadata
+    public long FirstActiveTime { get; set; }
+    public long LastActiveTime { get; set; }
+    public long OpenTime { get; set; }
+    public long FirstRowTime { get; set; }
+    public long LastRowTime { get; set; }
+    public long CloseTime { get; set; }
+    // Per-thread memory
+    public long InputMemoryGrant { get; set; }
+    public long OutputMemoryGrant { get; set; }
+    public long UsedMemoryGrant { get; set; }
+    // Batch mode
+    public long Batches { get; set; }
+    public long ActualEndOfScans { get; set; }
+    // Other
+    public long ActualLocallyAggregatedRows { get; set; }
+    public bool IsInterleavedExecuted { get; set; }
+    public long RowRequalifications { get; set; }
+}
+
+public class SpillDetail
+{
+    public string SpillType { get; set; } = ""; // "Sort", "Hash", "Exchange"
+    public long GrantedMemoryKB { get; set; }
+    public long UsedMemoryKB { get; set; }
+    public long WritesToTempDb { get; set; }
+    public long ReadsFromTempDb { get; set; }
+}
+
+public class ScalarUdfReference
+{
+    public string FunctionName { get; set; } = "";
+    public bool IsClrFunction { get; set; }
+    public string? ClrAssembly { get; set; }
+    public string? ClrClass { get; set; }
+    public string? ClrMethod { get; set; }
+}
+
+public class NamedParameterInfo
+{
+    public string Name { get; set; } = "";
+    public string? ScalarString { get; set; }
+}
diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj
index 5bc6031c..c87dd8a5 100644
--- a/Lite/PerformanceMonitorLite.csproj
+++ b/Lite/PerformanceMonitorLite.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>PerformanceMonitorLite</AssemblyName>
     <RootNamespace>PerformanceMonitorLite</RootNamespace>
     <Product>SQL Server Performance Monitor Lite</Product>
-    <Version>1.3.0</Version>
+    <Version>2.0.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <Description>Lightweight SQL Server performance monitoring - no installation required on target servers</Description>
@@ -64,6 +64,7 @@
 
   <ItemGroup>
     <Resource Include="EDD.ico" />
+    <Resource Include="Resources\PlanIcons\*.png" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lite/Resources/PlanIcons/adaptive_join.png b/Lite/Resources/PlanIcons/adaptive_join.png
new file mode 100644
index 00000000..a9de8452
Binary files /dev/null and b/Lite/Resources/PlanIcons/adaptive_join.png differ
diff --git a/Lite/Resources/PlanIcons/aggregate.png b/Lite/Resources/PlanIcons/aggregate.png
new file mode 100644
index 00000000..c9dfa1ab
Binary files /dev/null and b/Lite/Resources/PlanIcons/aggregate.png differ
diff --git a/Lite/Resources/PlanIcons/apply.png b/Lite/Resources/PlanIcons/apply.png
new file mode 100644
index 00000000..0e4972da
Binary files /dev/null and b/Lite/Resources/PlanIcons/apply.png differ
diff --git a/Lite/Resources/PlanIcons/arithmetic_expression.png b/Lite/Resources/PlanIcons/arithmetic_expression.png
new file mode 100644
index 00000000..532e6985
Binary files /dev/null and b/Lite/Resources/PlanIcons/arithmetic_expression.png differ
diff --git a/Lite/Resources/PlanIcons/assert.png b/Lite/Resources/PlanIcons/assert.png
new file mode 100644
index 00000000..8c828bf9
Binary files /dev/null and b/Lite/Resources/PlanIcons/assert.png differ
diff --git a/Lite/Resources/PlanIcons/assign.png b/Lite/Resources/PlanIcons/assign.png
new file mode 100644
index 00000000..6006369e
Binary files /dev/null and b/Lite/Resources/PlanIcons/assign.png differ
diff --git a/Lite/Resources/PlanIcons/batch_hash_table_build.png b/Lite/Resources/PlanIcons/batch_hash_table_build.png
new file mode 100644
index 00000000..f955ff4e
Binary files /dev/null and b/Lite/Resources/PlanIcons/batch_hash_table_build.png differ
diff --git a/Lite/Resources/PlanIcons/bitmap.png b/Lite/Resources/PlanIcons/bitmap.png
new file mode 100644
index 00000000..9010b0b7
Binary files /dev/null and b/Lite/Resources/PlanIcons/bitmap.png differ
diff --git a/Lite/Resources/PlanIcons/bookmark_lookup.png b/Lite/Resources/PlanIcons/bookmark_lookup.png
new file mode 100644
index 00000000..89d5d116
Binary files /dev/null and b/Lite/Resources/PlanIcons/bookmark_lookup.png differ
diff --git a/Lite/Resources/PlanIcons/broadcast.png b/Lite/Resources/PlanIcons/broadcast.png
new file mode 100644
index 00000000..05735c5a
Binary files /dev/null and b/Lite/Resources/PlanIcons/broadcast.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_index_delete.png b/Lite/Resources/PlanIcons/clustered_index_delete.png
new file mode 100644
index 00000000..6da544c7
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_index_delete.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_index_insert.png b/Lite/Resources/PlanIcons/clustered_index_insert.png
new file mode 100644
index 00000000..4706b31b
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_index_insert.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_index_merge.png b/Lite/Resources/PlanIcons/clustered_index_merge.png
new file mode 100644
index 00000000..c8191635
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_index_merge.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_index_scan.png b/Lite/Resources/PlanIcons/clustered_index_scan.png
new file mode 100644
index 00000000..58faec26
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_index_scan.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_index_seek.png b/Lite/Resources/PlanIcons/clustered_index_seek.png
new file mode 100644
index 00000000..13094bad
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_index_seek.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_index_update.png b/Lite/Resources/PlanIcons/clustered_index_update.png
new file mode 100644
index 00000000..956a8138
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_index_update.png differ
diff --git a/Lite/Resources/PlanIcons/clustered_update.png b/Lite/Resources/PlanIcons/clustered_update.png
new file mode 100644
index 00000000..15ccb904
Binary files /dev/null and b/Lite/Resources/PlanIcons/clustered_update.png differ
diff --git a/Lite/Resources/PlanIcons/collapse.png b/Lite/Resources/PlanIcons/collapse.png
new file mode 100644
index 00000000..7e241912
Binary files /dev/null and b/Lite/Resources/PlanIcons/collapse.png differ
diff --git a/Lite/Resources/PlanIcons/columnstore_index_delete.png b/Lite/Resources/PlanIcons/columnstore_index_delete.png
new file mode 100644
index 00000000..cac4731c
Binary files /dev/null and b/Lite/Resources/PlanIcons/columnstore_index_delete.png differ
diff --git a/Lite/Resources/PlanIcons/columnstore_index_insert.png b/Lite/Resources/PlanIcons/columnstore_index_insert.png
new file mode 100644
index 00000000..110242bf
Binary files /dev/null and b/Lite/Resources/PlanIcons/columnstore_index_insert.png differ
diff --git a/Lite/Resources/PlanIcons/columnstore_index_merge.png b/Lite/Resources/PlanIcons/columnstore_index_merge.png
new file mode 100644
index 00000000..cd5f7643
Binary files /dev/null and b/Lite/Resources/PlanIcons/columnstore_index_merge.png differ
diff --git a/Lite/Resources/PlanIcons/columnstore_index_scan.png b/Lite/Resources/PlanIcons/columnstore_index_scan.png
new file mode 100644
index 00000000..de030b6b
Binary files /dev/null and b/Lite/Resources/PlanIcons/columnstore_index_scan.png differ
diff --git a/Lite/Resources/PlanIcons/columnstore_index_update.png b/Lite/Resources/PlanIcons/columnstore_index_update.png
new file mode 100644
index 00000000..f0b2ad13
Binary files /dev/null and b/Lite/Resources/PlanIcons/columnstore_index_update.png differ
diff --git a/Lite/Resources/PlanIcons/compute_scalar.png b/Lite/Resources/PlanIcons/compute_scalar.png
new file mode 100644
index 00000000..7ce66cea
Binary files /dev/null and b/Lite/Resources/PlanIcons/compute_scalar.png differ
diff --git a/Lite/Resources/PlanIcons/compute_to_control_node.png b/Lite/Resources/PlanIcons/compute_to_control_node.png
new file mode 100644
index 00000000..98c0c95e
Binary files /dev/null and b/Lite/Resources/PlanIcons/compute_to_control_node.png differ
diff --git a/Lite/Resources/PlanIcons/concatenation.png b/Lite/Resources/PlanIcons/concatenation.png
new file mode 100644
index 00000000..214d6835
Binary files /dev/null and b/Lite/Resources/PlanIcons/concatenation.png differ
diff --git a/Lite/Resources/PlanIcons/const_table_get.png b/Lite/Resources/PlanIcons/const_table_get.png
new file mode 100644
index 00000000..0f32261c
Binary files /dev/null and b/Lite/Resources/PlanIcons/const_table_get.png differ
diff --git a/Lite/Resources/PlanIcons/constant_scan.png b/Lite/Resources/PlanIcons/constant_scan.png
new file mode 100644
index 00000000..88c1354b
Binary files /dev/null and b/Lite/Resources/PlanIcons/constant_scan.png differ
diff --git a/Lite/Resources/PlanIcons/control_to_compute_nodes.png b/Lite/Resources/PlanIcons/control_to_compute_nodes.png
new file mode 100644
index 00000000..47066d97
Binary files /dev/null and b/Lite/Resources/PlanIcons/control_to_compute_nodes.png differ
diff --git a/Lite/Resources/PlanIcons/convert.png b/Lite/Resources/PlanIcons/convert.png
new file mode 100644
index 00000000..badf83c7
Binary files /dev/null and b/Lite/Resources/PlanIcons/convert.png differ
diff --git a/Lite/Resources/PlanIcons/cursor_catch_all.png b/Lite/Resources/PlanIcons/cursor_catch_all.png
new file mode 100644
index 00000000..7344f5dd
Binary files /dev/null and b/Lite/Resources/PlanIcons/cursor_catch_all.png differ
diff --git a/Lite/Resources/PlanIcons/declare.png b/Lite/Resources/PlanIcons/declare.png
new file mode 100644
index 00000000..7d7f97b3
Binary files /dev/null and b/Lite/Resources/PlanIcons/declare.png differ
diff --git a/Lite/Resources/PlanIcons/delete.png b/Lite/Resources/PlanIcons/delete.png
new file mode 100644
index 00000000..2d1e1225
Binary files /dev/null and b/Lite/Resources/PlanIcons/delete.png differ
diff --git a/Lite/Resources/PlanIcons/deleted_scan.png b/Lite/Resources/PlanIcons/deleted_scan.png
new file mode 100644
index 00000000..84e6c0ab
Binary files /dev/null and b/Lite/Resources/PlanIcons/deleted_scan.png differ
diff --git a/Lite/Resources/PlanIcons/dynamic.png b/Lite/Resources/PlanIcons/dynamic.png
new file mode 100644
index 00000000..01e92669
Binary files /dev/null and b/Lite/Resources/PlanIcons/dynamic.png differ
diff --git a/Lite/Resources/PlanIcons/external_broadcast.png b/Lite/Resources/PlanIcons/external_broadcast.png
new file mode 100644
index 00000000..373f0180
Binary files /dev/null and b/Lite/Resources/PlanIcons/external_broadcast.png differ
diff --git a/Lite/Resources/PlanIcons/external_export.png b/Lite/Resources/PlanIcons/external_export.png
new file mode 100644
index 00000000..75331148
Binary files /dev/null and b/Lite/Resources/PlanIcons/external_export.png differ
diff --git a/Lite/Resources/PlanIcons/external_local_streaming.png b/Lite/Resources/PlanIcons/external_local_streaming.png
new file mode 100644
index 00000000..48889aed
Binary files /dev/null and b/Lite/Resources/PlanIcons/external_local_streaming.png differ
diff --git a/Lite/Resources/PlanIcons/external_round_robin.png b/Lite/Resources/PlanIcons/external_round_robin.png
new file mode 100644
index 00000000..b0202d4f
Binary files /dev/null and b/Lite/Resources/PlanIcons/external_round_robin.png differ
diff --git a/Lite/Resources/PlanIcons/external_shuffle.png b/Lite/Resources/PlanIcons/external_shuffle.png
new file mode 100644
index 00000000..6d7c24cf
Binary files /dev/null and b/Lite/Resources/PlanIcons/external_shuffle.png differ
diff --git a/Lite/Resources/PlanIcons/fetch_query.png b/Lite/Resources/PlanIcons/fetch_query.png
new file mode 100644
index 00000000..a1fd0f12
Binary files /dev/null and b/Lite/Resources/PlanIcons/fetch_query.png differ
diff --git a/Lite/Resources/PlanIcons/filter.png b/Lite/Resources/PlanIcons/filter.png
new file mode 100644
index 00000000..af726e90
Binary files /dev/null and b/Lite/Resources/PlanIcons/filter.png differ
diff --git a/Lite/Resources/PlanIcons/foreign_key_references_check.png b/Lite/Resources/PlanIcons/foreign_key_references_check.png
new file mode 100644
index 00000000..f87b6443
Binary files /dev/null and b/Lite/Resources/PlanIcons/foreign_key_references_check.png differ
diff --git a/Lite/Resources/PlanIcons/get.png b/Lite/Resources/PlanIcons/get.png
new file mode 100644
index 00000000..79e832f2
Binary files /dev/null and b/Lite/Resources/PlanIcons/get.png differ
diff --git a/Lite/Resources/PlanIcons/group_by_aggregate.png b/Lite/Resources/PlanIcons/group_by_aggregate.png
new file mode 100644
index 00000000..cdb1bf9e
Binary files /dev/null and b/Lite/Resources/PlanIcons/group_by_aggregate.png differ
diff --git a/Lite/Resources/PlanIcons/hash_match.png b/Lite/Resources/PlanIcons/hash_match.png
new file mode 100644
index 00000000..fb78ddcf
Binary files /dev/null and b/Lite/Resources/PlanIcons/hash_match.png differ
diff --git a/Lite/Resources/PlanIcons/hash_match_root.png b/Lite/Resources/PlanIcons/hash_match_root.png
new file mode 100644
index 00000000..07f46f53
Binary files /dev/null and b/Lite/Resources/PlanIcons/hash_match_root.png differ
diff --git a/Lite/Resources/PlanIcons/hash_match_team.png b/Lite/Resources/PlanIcons/hash_match_team.png
new file mode 100644
index 00000000..c1070796
Binary files /dev/null and b/Lite/Resources/PlanIcons/hash_match_team.png differ
diff --git a/Lite/Resources/PlanIcons/if.png b/Lite/Resources/PlanIcons/if.png
new file mode 100644
index 00000000..0aedbcb3
Binary files /dev/null and b/Lite/Resources/PlanIcons/if.png differ
diff --git a/Lite/Resources/PlanIcons/index_delete.png b/Lite/Resources/PlanIcons/index_delete.png
new file mode 100644
index 00000000..c367019f
Binary files /dev/null and b/Lite/Resources/PlanIcons/index_delete.png differ
diff --git a/Lite/Resources/PlanIcons/index_insert.png b/Lite/Resources/PlanIcons/index_insert.png
new file mode 100644
index 00000000..723e71a5
Binary files /dev/null and b/Lite/Resources/PlanIcons/index_insert.png differ
diff --git a/Lite/Resources/PlanIcons/index_scan.png b/Lite/Resources/PlanIcons/index_scan.png
new file mode 100644
index 00000000..e373d6c8
Binary files /dev/null and b/Lite/Resources/PlanIcons/index_scan.png differ
diff --git a/Lite/Resources/PlanIcons/index_seek.png b/Lite/Resources/PlanIcons/index_seek.png
new file mode 100644
index 00000000..093805cd
Binary files /dev/null and b/Lite/Resources/PlanIcons/index_seek.png differ
diff --git a/Lite/Resources/PlanIcons/index_spool.png b/Lite/Resources/PlanIcons/index_spool.png
new file mode 100644
index 00000000..5d0fa8f6
Binary files /dev/null and b/Lite/Resources/PlanIcons/index_spool.png differ
diff --git a/Lite/Resources/PlanIcons/index_update.png b/Lite/Resources/PlanIcons/index_update.png
new file mode 100644
index 00000000..0b4570e4
Binary files /dev/null and b/Lite/Resources/PlanIcons/index_update.png differ
diff --git a/Lite/Resources/PlanIcons/insert.png b/Lite/Resources/PlanIcons/insert.png
new file mode 100644
index 00000000..87fca574
Binary files /dev/null and b/Lite/Resources/PlanIcons/insert.png differ
diff --git a/Lite/Resources/PlanIcons/inserted_scan.png b/Lite/Resources/PlanIcons/inserted_scan.png
new file mode 100644
index 00000000..4f2db17c
Binary files /dev/null and b/Lite/Resources/PlanIcons/inserted_scan.png differ
diff --git a/Lite/Resources/PlanIcons/intrinsic.png b/Lite/Resources/PlanIcons/intrinsic.png
new file mode 100644
index 00000000..8c5b614e
Binary files /dev/null and b/Lite/Resources/PlanIcons/intrinsic.png differ
diff --git a/Lite/Resources/PlanIcons/iterator_catch_all.png b/Lite/Resources/PlanIcons/iterator_catch_all.png
new file mode 100644
index 00000000..5a2d728d
Binary files /dev/null and b/Lite/Resources/PlanIcons/iterator_catch_all.png differ
diff --git a/Lite/Resources/PlanIcons/join.png b/Lite/Resources/PlanIcons/join.png
new file mode 100644
index 00000000..aefe5b44
Binary files /dev/null and b/Lite/Resources/PlanIcons/join.png differ
diff --git a/Lite/Resources/PlanIcons/keyset.png b/Lite/Resources/PlanIcons/keyset.png
new file mode 100644
index 00000000..f6371f4c
Binary files /dev/null and b/Lite/Resources/PlanIcons/keyset.png differ
diff --git a/Lite/Resources/PlanIcons/language_construct_catch_all.png b/Lite/Resources/PlanIcons/language_construct_catch_all.png
new file mode 100644
index 00000000..2d247ce7
Binary files /dev/null and b/Lite/Resources/PlanIcons/language_construct_catch_all.png differ
diff --git a/Lite/Resources/PlanIcons/locate.png b/Lite/Resources/PlanIcons/locate.png
new file mode 100644
index 00000000..5cba6679
Binary files /dev/null and b/Lite/Resources/PlanIcons/locate.png differ
diff --git a/Lite/Resources/PlanIcons/log_row_scan.png b/Lite/Resources/PlanIcons/log_row_scan.png
new file mode 100644
index 00000000..bfe7875f
Binary files /dev/null and b/Lite/Resources/PlanIcons/log_row_scan.png differ
diff --git a/Lite/Resources/PlanIcons/merge_interval.png b/Lite/Resources/PlanIcons/merge_interval.png
new file mode 100644
index 00000000..98b2aef9
Binary files /dev/null and b/Lite/Resources/PlanIcons/merge_interval.png differ
diff --git a/Lite/Resources/PlanIcons/merge_join.png b/Lite/Resources/PlanIcons/merge_join.png
new file mode 100644
index 00000000..b9c1bcee
Binary files /dev/null and b/Lite/Resources/PlanIcons/merge_join.png differ
diff --git a/Lite/Resources/PlanIcons/nested_loops.png b/Lite/Resources/PlanIcons/nested_loops.png
new file mode 100644
index 00000000..89f6c764
Binary files /dev/null and b/Lite/Resources/PlanIcons/nested_loops.png differ
diff --git a/Lite/Resources/PlanIcons/parallelism.png b/Lite/Resources/PlanIcons/parallelism.png
new file mode 100644
index 00000000..45d28d80
Binary files /dev/null and b/Lite/Resources/PlanIcons/parallelism.png differ
diff --git a/Lite/Resources/PlanIcons/parameter_table_scan.png b/Lite/Resources/PlanIcons/parameter_table_scan.png
new file mode 100644
index 00000000..5dd33d65
Binary files /dev/null and b/Lite/Resources/PlanIcons/parameter_table_scan.png differ
diff --git a/Lite/Resources/PlanIcons/population_query.png b/Lite/Resources/PlanIcons/population_query.png
new file mode 100644
index 00000000..172c90e8
Binary files /dev/null and b/Lite/Resources/PlanIcons/population_query.png differ
diff --git a/Lite/Resources/PlanIcons/predict.png b/Lite/Resources/PlanIcons/predict.png
new file mode 100644
index 00000000..deb2b309
Binary files /dev/null and b/Lite/Resources/PlanIcons/predict.png differ
diff --git a/Lite/Resources/PlanIcons/print.png b/Lite/Resources/PlanIcons/print.png
new file mode 100644
index 00000000..9ecab730
Binary files /dev/null and b/Lite/Resources/PlanIcons/print.png differ
diff --git a/Lite/Resources/PlanIcons/project.png b/Lite/Resources/PlanIcons/project.png
new file mode 100644
index 00000000..be9d1765
Binary files /dev/null and b/Lite/Resources/PlanIcons/project.png differ
diff --git a/Lite/Resources/PlanIcons/rank.png b/Lite/Resources/PlanIcons/rank.png
new file mode 100644
index 00000000..00845904
Binary files /dev/null and b/Lite/Resources/PlanIcons/rank.png differ
diff --git a/Lite/Resources/PlanIcons/refresh_query.png b/Lite/Resources/PlanIcons/refresh_query.png
new file mode 100644
index 00000000..eeb4e751
Binary files /dev/null and b/Lite/Resources/PlanIcons/refresh_query.png differ
diff --git a/Lite/Resources/PlanIcons/remote_delete.png b/Lite/Resources/PlanIcons/remote_delete.png
new file mode 100644
index 00000000..6c4d1b7b
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_delete.png differ
diff --git a/Lite/Resources/PlanIcons/remote_index_scan.png b/Lite/Resources/PlanIcons/remote_index_scan.png
new file mode 100644
index 00000000..1f06dd59
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_index_scan.png differ
diff --git a/Lite/Resources/PlanIcons/remote_index_seek.png b/Lite/Resources/PlanIcons/remote_index_seek.png
new file mode 100644
index 00000000..94e66cb8
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_index_seek.png differ
diff --git a/Lite/Resources/PlanIcons/remote_insert.png b/Lite/Resources/PlanIcons/remote_insert.png
new file mode 100644
index 00000000..9a22f89c
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_insert.png differ
diff --git a/Lite/Resources/PlanIcons/remote_query.png b/Lite/Resources/PlanIcons/remote_query.png
new file mode 100644
index 00000000..073dcef4
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_query.png differ
diff --git a/Lite/Resources/PlanIcons/remote_scan.png b/Lite/Resources/PlanIcons/remote_scan.png
new file mode 100644
index 00000000..24a43a95
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_scan.png differ
diff --git a/Lite/Resources/PlanIcons/remote_update.png b/Lite/Resources/PlanIcons/remote_update.png
new file mode 100644
index 00000000..f027393c
Binary files /dev/null and b/Lite/Resources/PlanIcons/remote_update.png differ
diff --git a/Lite/Resources/PlanIcons/result.png b/Lite/Resources/PlanIcons/result.png
new file mode 100644
index 00000000..e3545a1b
Binary files /dev/null and b/Lite/Resources/PlanIcons/result.png differ
diff --git a/Lite/Resources/PlanIcons/rid_lookup.png b/Lite/Resources/PlanIcons/rid_lookup.png
new file mode 100644
index 00000000..83ad0c04
Binary files /dev/null and b/Lite/Resources/PlanIcons/rid_lookup.png differ
diff --git a/Lite/Resources/PlanIcons/row_count_spool.png b/Lite/Resources/PlanIcons/row_count_spool.png
new file mode 100644
index 00000000..40ee6c52
Binary files /dev/null and b/Lite/Resources/PlanIcons/row_count_spool.png differ
diff --git a/Lite/Resources/PlanIcons/segment.png b/Lite/Resources/PlanIcons/segment.png
new file mode 100644
index 00000000..64e1218f
Binary files /dev/null and b/Lite/Resources/PlanIcons/segment.png differ
diff --git a/Lite/Resources/PlanIcons/sequence.png b/Lite/Resources/PlanIcons/sequence.png
new file mode 100644
index 00000000..1a5aeb8c
Binary files /dev/null and b/Lite/Resources/PlanIcons/sequence.png differ
diff --git a/Lite/Resources/PlanIcons/sequence_project.png b/Lite/Resources/PlanIcons/sequence_project.png
new file mode 100644
index 00000000..29dc7b89
Binary files /dev/null and b/Lite/Resources/PlanIcons/sequence_project.png differ
diff --git a/Lite/Resources/PlanIcons/set_function.png b/Lite/Resources/PlanIcons/set_function.png
new file mode 100644
index 00000000..7272565f
Binary files /dev/null and b/Lite/Resources/PlanIcons/set_function.png differ
diff --git a/Lite/Resources/PlanIcons/shuffle.png b/Lite/Resources/PlanIcons/shuffle.png
new file mode 100644
index 00000000..dafa5383
Binary files /dev/null and b/Lite/Resources/PlanIcons/shuffle.png differ
diff --git a/Lite/Resources/PlanIcons/single_source_round_robin.png b/Lite/Resources/PlanIcons/single_source_round_robin.png
new file mode 100644
index 00000000..e77bd9fa
Binary files /dev/null and b/Lite/Resources/PlanIcons/single_source_round_robin.png differ
diff --git a/Lite/Resources/PlanIcons/single_source_shuffle.png b/Lite/Resources/PlanIcons/single_source_shuffle.png
new file mode 100644
index 00000000..f8b27a70
Binary files /dev/null and b/Lite/Resources/PlanIcons/single_source_shuffle.png differ
diff --git a/Lite/Resources/PlanIcons/snapshot.png b/Lite/Resources/PlanIcons/snapshot.png
new file mode 100644
index 00000000..110e1912
Binary files /dev/null and b/Lite/Resources/PlanIcons/snapshot.png differ
diff --git a/Lite/Resources/PlanIcons/sort.png b/Lite/Resources/PlanIcons/sort.png
new file mode 100644
index 00000000..5d36843d
Binary files /dev/null and b/Lite/Resources/PlanIcons/sort.png differ
diff --git a/Lite/Resources/PlanIcons/split.png b/Lite/Resources/PlanIcons/split.png
new file mode 100644
index 00000000..37c6369d
Binary files /dev/null and b/Lite/Resources/PlanIcons/split.png differ
diff --git a/Lite/Resources/PlanIcons/spool.png b/Lite/Resources/PlanIcons/spool.png
new file mode 100644
index 00000000..cc2a20d0
Binary files /dev/null and b/Lite/Resources/PlanIcons/spool.png differ
diff --git a/Lite/Resources/PlanIcons/sql.png b/Lite/Resources/PlanIcons/sql.png
new file mode 100644
index 00000000..112e580a
Binary files /dev/null and b/Lite/Resources/PlanIcons/sql.png differ
diff --git a/Lite/Resources/PlanIcons/stream_aggregate.png b/Lite/Resources/PlanIcons/stream_aggregate.png
new file mode 100644
index 00000000..04285c1a
Binary files /dev/null and b/Lite/Resources/PlanIcons/stream_aggregate.png differ
diff --git a/Lite/Resources/PlanIcons/switch.png b/Lite/Resources/PlanIcons/switch.png
new file mode 100644
index 00000000..20d342a8
Binary files /dev/null and b/Lite/Resources/PlanIcons/switch.png differ
diff --git a/Lite/Resources/PlanIcons/table_delete.png b/Lite/Resources/PlanIcons/table_delete.png
new file mode 100644
index 00000000..09ee8625
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_delete.png differ
diff --git a/Lite/Resources/PlanIcons/table_insert.png b/Lite/Resources/PlanIcons/table_insert.png
new file mode 100644
index 00000000..3b515fda
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_insert.png differ
diff --git a/Lite/Resources/PlanIcons/table_merge.png b/Lite/Resources/PlanIcons/table_merge.png
new file mode 100644
index 00000000..f390461b
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_merge.png differ
diff --git a/Lite/Resources/PlanIcons/table_scan.png b/Lite/Resources/PlanIcons/table_scan.png
new file mode 100644
index 00000000..ad807feb
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_scan.png differ
diff --git a/Lite/Resources/PlanIcons/table_spool.png b/Lite/Resources/PlanIcons/table_spool.png
new file mode 100644
index 00000000..3ba8e7cb
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_spool.png differ
diff --git a/Lite/Resources/PlanIcons/table_update.png b/Lite/Resources/PlanIcons/table_update.png
new file mode 100644
index 00000000..171bc4f9
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_update.png differ
diff --git a/Lite/Resources/PlanIcons/table_valued_function.png b/Lite/Resources/PlanIcons/table_valued_function.png
new file mode 100644
index 00000000..6969e595
Binary files /dev/null and b/Lite/Resources/PlanIcons/table_valued_function.png differ
diff --git a/Lite/Resources/PlanIcons/top.png b/Lite/Resources/PlanIcons/top.png
new file mode 100644
index 00000000..e47f1221
Binary files /dev/null and b/Lite/Resources/PlanIcons/top.png differ
diff --git a/Lite/Resources/PlanIcons/trim.png b/Lite/Resources/PlanIcons/trim.png
new file mode 100644
index 00000000..b398045f
Binary files /dev/null and b/Lite/Resources/PlanIcons/trim.png differ
diff --git a/Lite/Resources/PlanIcons/udx.png b/Lite/Resources/PlanIcons/udx.png
new file mode 100644
index 00000000..59b331ee
Binary files /dev/null and b/Lite/Resources/PlanIcons/udx.png differ
diff --git a/Lite/Resources/PlanIcons/union.png b/Lite/Resources/PlanIcons/union.png
new file mode 100644
index 00000000..4bf96a9d
Binary files /dev/null and b/Lite/Resources/PlanIcons/union.png differ
diff --git a/Lite/Resources/PlanIcons/union_all.png b/Lite/Resources/PlanIcons/union_all.png
new file mode 100644
index 00000000..d1996475
Binary files /dev/null and b/Lite/Resources/PlanIcons/union_all.png differ
diff --git a/Lite/Resources/PlanIcons/update.png b/Lite/Resources/PlanIcons/update.png
new file mode 100644
index 00000000..ea13c72b
Binary files /dev/null and b/Lite/Resources/PlanIcons/update.png differ
diff --git a/Lite/Resources/PlanIcons/window_aggregate.png b/Lite/Resources/PlanIcons/window_aggregate.png
new file mode 100644
index 00000000..9f2f161c
Binary files /dev/null and b/Lite/Resources/PlanIcons/window_aggregate.png differ
diff --git a/Lite/Services/ActualPlanExecutor.cs b/Lite/Services/ActualPlanExecutor.cs
new file mode 100644
index 00000000..e4b06a14
--- /dev/null
+++ b/Lite/Services/ActualPlanExecutor.cs
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+
+namespace PerformanceMonitorLite.Services;
+
+/// <summary>
+/// Executes a query against SQL Server with SET STATISTICS XML ON to capture
+/// the actual execution plan with runtime statistics. All data result sets
+/// are consumed and discarded — only the plan XML is returned.
+/// </summary>
+public static class ActualPlanExecutor
+{
+    /// <summary>
+    /// Executes the given query text and captures the actual execution plan XML.
+    /// </summary>
+    /// <param name="connectionString">Connection string to the target server.</param>
+    /// <param name="databaseName">Database context for execution.</param>
+    /// <param name="queryText">The query text to execute.</param>
+    /// <param name="planXml">Optional estimated plan XML (used to extract SET options and parameters).</param>
+    /// <param name="isolationLevel">Optional transaction isolation level.</param>
+    /// <param name="isAzureSqlDb">If true, skips USE [database] in the repro script.</param>
+    /// <param name="timeoutSeconds">Command timeout in seconds.</param>
+    /// <param name="cancellationToken">Cancellation token for user abort.</param>
+    /// <returns>The actual execution plan XML, or null if no plan was captured.</returns>
+    public static async Task<string?> ExecuteForActualPlanAsync(
+        string connectionString,
+        string databaseName,
+        string queryText,
+        string? planXml,
+        string? isolationLevel,
+        bool isAzureSqlDb,
+        int timeoutSeconds,
+        CancellationToken cancellationToken)
+    {
+        /* Build the repro script (includes SET options from plan XML via #233) */
+        var reproScript = ReproScriptBuilder.BuildReproScript(
+            queryText, databaseName, planXml, isolationLevel,
+            source: "Actual Plan Capture", isAzureSqlDb: isAzureSqlDb);
+
+        /* Wrap with SET STATISTICS XML ON/OFF */
+        var sb = new StringBuilder();
+        sb.AppendLine("SET STATISTICS XML ON;");
+        sb.AppendLine(reproScript);
+        sb.AppendLine("SET STATISTICS XML OFF;");
+
+        var fullScript = sb.ToString();
+        string? capturedPlanXml = null;
+
+        /* Override database in connection string */
+        var builder = new SqlConnectionStringBuilder(connectionString);
+        if (!string.IsNullOrEmpty(databaseName) && !isAzureSqlDb)
+        {
+            builder.InitialCatalog = databaseName;
+        }
+
+        await using var connection = new SqlConnection(builder.ConnectionString);
+        await connection.OpenAsync(cancellationToken);
+
+        using var command = new SqlCommand(fullScript, connection);
+        command.CommandTimeout = timeoutSeconds;
+
+        /* Wire cancellation token to SqlCommand.Cancel() for clean abort */
+        await using var registration = cancellationToken.Register(() =>
+        {
+            try { command.Cancel(); } catch { /* best effort */ }
+        });
+
+        using var reader = await command.ExecuteReaderAsync(cancellationToken);
+
+        /* Iterate all result sets. SET STATISTICS XML ON causes SQL Server to
+           append a plan XML result set after each statement's data result set.
+           The plan result set has a single row with a single XML column. */
+        do
+        {
+            if (reader.FieldCount == 1 && await reader.ReadAsync(cancellationToken))
+            {
+                var value = reader.GetValue(0)?.ToString();
+                if (value != null && value.TrimStart().StartsWith("<ShowPlanXML", StringComparison.Ordinal))
+                {
+                    /* This is a plan XML result set — capture it */
+                    capturedPlanXml = value;
+                }
+                else
+                {
+                    /* Data result set — consume and discard remaining rows */
+                    while (await reader.ReadAsync(cancellationToken)) { }
+                }
+            }
+            else
+            {
+                /* Multi-column data result set — consume and discard all rows */
+                while (await reader.ReadAsync(cancellationToken)) { }
+            }
+        }
+        while (await reader.NextResultAsync(cancellationToken));
+
+        return capturedPlanXml;
+    }
+}
diff --git a/Lite/Services/AppLoggerAdapter.cs b/Lite/Services/AppLoggerAdapter.cs
new file mode 100644
index 00000000..2bd1c79d
--- /dev/null
+++ b/Lite/Services/AppLoggerAdapter.cs
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace PerformanceMonitorLite.Services;
+
+/// <summary>
+/// Bridges the static AppLogger to the ILogger&lt;T&gt; interface so services
+/// that accept ILogger&lt;T&gt; can log to the same file as the rest of the app.
+/// </summary>
+public sealed class AppLoggerAdapter<T> : ILogger<T>
+{
+    private readonly string _categoryName = typeof(T).Name;
+
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
+
+    public bool IsEnabled(LogLevel logLevel) => logLevel >= LogLevel.Debug;
+
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+    {
+        if (!IsEnabled(logLevel)) return;
+
+        var message = formatter(state, exception);
+
+        switch (logLevel)
+        {
+            case LogLevel.Trace:
+            case LogLevel.Debug:
+                AppLogger.Debug(_categoryName, message);
+                break;
+            case LogLevel.Information:
+                AppLogger.Info(_categoryName, message);
+                break;
+            case LogLevel.Warning:
+                AppLogger.Warn(_categoryName, message);
+                break;
+            case LogLevel.Error:
+            case LogLevel.Critical:
+                AppLogger.Error(_categoryName, message, exception);
+                break;
+        }
+    }
+}
diff --git a/Lite/Services/ArchiveService.cs b/Lite/Services/ArchiveService.cs
index 5b71fac1..34ddb761 100644
--- a/Lite/Services/ArchiveService.cs
+++ b/Lite/Services/ArchiveService.cs
@@ -58,10 +58,12 @@ public ArchiveService(DuckDbInitializer duckDb, string archivePath, ILogger<Arch
     }
 
     /// <summary>
-    /// Archives data older than the specified number of days to Parquet files,
+    /// Archives data older than the specified cutoff to Parquet files,
     /// then deletes the archived rows from the hot tables.
+    /// Use hotDataDays for scheduled archival (default 7), or hotDataHours
+    /// for size-triggered archival when the database is under space pressure.
     /// </summary>
-    public async Task ArchiveOldDataAsync(int hotDataDays = 7)
+    public async Task ArchiveOldDataAsync(int hotDataDays = 7, int? hotDataHours = null)
     {
         if (!await s_archiveLock.WaitAsync(TimeSpan.Zero))
         {
@@ -71,65 +73,55 @@ public async Task ArchiveOldDataAsync(int hotDataDays = 7)
 
         try
         {
-        var cutoffDate = DateTime.UtcNow.AddDays(-hotDataDays);
-        var archiveMonth = cutoffDate.ToString("yyyy-MM");
+        var cutoffDate = hotDataHours.HasValue
+            ? DateTime.UtcNow.AddHours(-hotDataHours.Value)
+            : DateTime.UtcNow.AddDays(-hotDataDays);
+        var timestamp = DateTime.UtcNow.ToString("yyyyMMdd_HHmm");
 
-        _logger?.LogInformation("Archiving data older than {CutoffDate} to Parquet (month: {Month})", cutoffDate, archiveMonth);
+        _logger?.LogInformation("Archiving data older than {CutoffDate} to Parquet (prefix: {Timestamp})", cutoffDate, timestamp);
 
-        using var connection = _duckDb.CreateConnection();
-        await connection.OpenAsync();
-
-        foreach (var (table, timeColumn) in ArchivableTables)
+        /* Write lock covers export + DELETE. The DELETEs modify table data, and the
+           next CHECKPOINT will reorganize the file — readers must not be mid-query
+           when that happens or they get "Reached the end of the file" errors. */
+        using (_duckDb.AcquireWriteLock())
         {
-            try
+            using var connection = _duckDb.CreateConnection();
+            await connection.OpenAsync();
+
+            foreach (var (table, timeColumn) in ArchivableTables)
             {
-                /* Check if there are rows to archive */
-                var rowCount = await GetRowCountBeforeCutoff(connection, table, timeColumn, cutoffDate);
-                if (rowCount == 0)
+                try
                 {
-                    continue;
-                }
+                    /* Check if there are rows to archive */
+                    var rowCount = await GetRowCountBeforeCutoff(connection, table, timeColumn, cutoffDate);
+                    if (rowCount == 0)
+                    {
+                        continue;
+                    }
+
+                    /* Export to a uniquely-named parquet file — no merging needed.
+                       Each archival cycle produces a new file with a timestamp prefix.
+                       Archive views use glob (*_table.parquet) to pick up all files. */
+                    var parquetPath = Path.Combine(_archivePath, $"{timestamp}_{table}.parquet")
+                        .Replace("\\", "/");
 
-                /* Export to Parquet (append mode - UNION if file exists) */
-                var parquetPath = Path.Combine(_archivePath, $"{archiveMonth}_{table}.parquet")
-                    .Replace("\\", "/");
+                    await ExportToParquet(connection, table, timeColumn, cutoffDate, parquetPath);
 
-                if (File.Exists(parquetPath))
-                {
-                    /* Append: write to temp, then UNION with existing */
-                    var tempPath = parquetPath + ".tmp";
-                    await ExportToParquet(connection, table, timeColumn, cutoffDate, tempPath);
+                    /* Delete archived rows from hot table */
+                    using var deleteCmd = connection.CreateCommand();
+                    deleteCmd.CommandText = $"DELETE FROM {table} WHERE {timeColumn} < '{cutoffDate:yyyy-MM-dd HH:mm:ss}'";
+                    await deleteCmd.ExecuteNonQueryAsync();
 
-                    using var mergeCmd = connection.CreateCommand();
-                    mergeCmd.CommandText = $@"
-COPY (
-    SELECT * FROM read_parquet('{parquetPath}')
-    UNION ALL
-    SELECT * FROM read_parquet('{tempPath}')
-) TO '{parquetPath}' (FORMAT PARQUET, COMPRESSION ZSTD)";
-                    await mergeCmd.ExecuteNonQueryAsync();
-
-                    File.Delete(tempPath);
+                    _logger?.LogInformation("Archived {Count} rows from {Table} to {Path}", rowCount, table, parquetPath);
                 }
-                else
+                catch (Exception ex)
                 {
-                    await ExportToParquet(connection, table, timeColumn, cutoffDate, parquetPath);
+                    _logger?.LogError(ex, "Failed to archive table {Table}", table);
                 }
-
-                /* Delete archived rows from hot table */
-                using var deleteCmd = connection.CreateCommand();
-                deleteCmd.CommandText = $"DELETE FROM {table} WHERE {timeColumn} < '{cutoffDate:yyyy-MM-dd HH:mm:ss}'";
-                await deleteCmd.ExecuteNonQueryAsync();
-
-                _logger?.LogInformation("Archived {Count} rows from {Table} to {Path}", rowCount, table, parquetPath);
-            }
-            catch (Exception ex)
-            {
-                _logger?.LogError(ex, "Failed to archive table {Table}", table);
             }
         }
 
-        /* Refresh archive views so newly archived parquet files are queryable */
+        /* Refresh archive views outside write lock — view creation is fast and safe */
         await _duckDb.CreateArchiveViewsAsync();
         }
         finally
@@ -155,4 +147,74 @@ private static async Task ExportToParquet(DuckDBConnection connection, string ta
 ) TO '{filePath}' (FORMAT PARQUET, COMPRESSION ZSTD)";
         await cmd.ExecuteNonQueryAsync();
     }
+
+    /// <summary>
+    /// Archives ALL data from every table to parquet, then deletes and reinitializes the database.
+    /// Called when the database exceeds the size threshold. Data remains queryable through archive views.
+    /// </summary>
+    public async Task ArchiveAllAndResetAsync()
+    {
+        if (!await s_archiveLock.WaitAsync(TimeSpan.Zero))
+        {
+            _logger?.LogDebug("Archive operation already in progress, skipping");
+            return;
+        }
+
+        try
+        {
+            var timestamp = DateTime.UtcNow.ToString("yyyyMMdd_HHmm");
+
+            _logger?.LogInformation("Archiving ALL data to Parquet (prefix: {Timestamp}) and resetting database", timestamp);
+
+            /* Export everything under write lock */
+            using (_duckDb.AcquireWriteLock())
+            {
+                using var connection = _duckDb.CreateConnection();
+                await connection.OpenAsync();
+
+                foreach (var (table, _) in ArchivableTables)
+                {
+                    try
+                    {
+                        /* Check row count */
+                        using var countCmd = connection.CreateCommand();
+                        countCmd.CommandText = $"SELECT COUNT(*) FROM {table}";
+                        var rowCount = Convert.ToInt64(await countCmd.ExecuteScalarAsync());
+                        if (rowCount == 0) continue;
+
+                        /* Export all rows to a uniquely-named parquet file.
+                           No merging needed — each reset produces a new file.
+                           Archive views use glob (*_table.parquet) to pick up all files. */
+                        var parquetPath = Path.Combine(_archivePath, $"{timestamp}_{table}.parquet")
+                            .Replace("\\", "/");
+
+                        using var exportCmd = connection.CreateCommand();
+                        exportCmd.CommandText = $"COPY (SELECT * FROM {table}) TO '{parquetPath}' (FORMAT PARQUET, COMPRESSION ZSTD)";
+                        await exportCmd.ExecuteNonQueryAsync();
+
+                        _logger?.LogInformation("Archived {Count} rows from {Table}", rowCount, table);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger?.LogError(ex, "Failed to archive table {Table}", table);
+                    }
+                }
+            }
+
+            /* Nuke and reinitialize outside the using-connection scope so all handles are closed */
+            _logger?.LogInformation("Deleting and reinitializing database");
+            await _duckDb.ResetDatabaseAsync();
+
+            _logger?.LogInformation("Database reset complete — archive views now serve all historical data from Parquet");
+        }
+        catch (Exception ex)
+        {
+            _logger?.LogError(ex, "Archive-all-and-reset failed");
+        }
+        finally
+        {
+            s_archiveLock.Release();
+        }
+    }
+
 }
diff --git a/Lite/Services/CollectionBackgroundService.cs b/Lite/Services/CollectionBackgroundService.cs
index 1459c936..4641dd61 100644
--- a/Lite/Services/CollectionBackgroundService.cs
+++ b/Lite/Services/CollectionBackgroundService.cs
@@ -29,19 +29,19 @@ public class CollectionBackgroundService : BackgroundService
     private readonly ILogger<CollectionBackgroundService>? _logger;
 
     private static readonly TimeSpan CollectionInterval = TimeSpan.FromMinutes(1);
-    /* Start at UtcNow so maintenance tasks don't all fire on the very first cycle.
-       Archival runs after 1 hour, retention + compaction after 24 hours of uptime. */
+    /* Start at UtcNow so maintenance tasks don't all fire on the very first cycle. */
     private DateTime _lastArchiveTime = DateTime.UtcNow;
     private DateTime _lastRetentionTime = DateTime.UtcNow;
-    private DateTime _lastCompactionTime = DateTime.UtcNow;
 
-    /* Archive every hour, retention + compaction once per day */
+    /* Archive every hour, retention once per day */
     private static readonly TimeSpan ArchiveInterval = TimeSpan.FromHours(1);
     private static readonly TimeSpan RetentionInterval = TimeSpan.FromHours(24);
-    private static readonly TimeSpan CompactionInterval = TimeSpan.FromHours(24);
 
-    /* Warn if database exceeds this size between compaction cycles */
-    private const double SizeWarningThresholdMb = 1024;
+    /* Size-based trigger — when the database exceeds this size, archive ALL data
+       to parquet and reset the database. INSERT performance degrades badly with
+       large tables (33x slower at 667MB in testing). Data remains fully queryable
+       through the archive views (hot UNION parquet). */
+    private const double ArchiveSizeThresholdMb = 512;
 
     public bool IsPaused { get; set; }
     public DateTime? LastCollectionTime { get; private set; }
@@ -109,14 +109,11 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     IsCollecting = false;
                 }
 
-                /* Periodic archival */
+                /* Periodic archival (time-based or size-based) */
                 await RunArchivalIfDueAsync();
 
                 /* Periodic retention cleanup */
                 RunRetentionIfDue();
-
-                /* Periodic database compaction to prevent bloat */
-                await RunCompactionIfDueAsync();
             }
 
             try
@@ -134,14 +131,31 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
     private async Task RunArchivalIfDueAsync()
     {
-        if (_archiveService == null || DateTime.UtcNow - _lastArchiveTime < ArchiveInterval)
+        if (_archiveService == null)
+        {
+            return;
+        }
+
+        var timeDue = DateTime.UtcNow - _lastArchiveTime >= ArchiveInterval;
+        var sizeDue = _duckDb != null && _duckDb.GetDatabaseSizeMb() >= ArchiveSizeThresholdMb;
+
+        if (!timeDue && !sizeDue)
         {
             return;
         }
 
         try
         {
-            await _archiveService.ArchiveOldDataAsync(hotDataDays: 7);
+            if (sizeDue)
+            {
+                _logger?.LogInformation("Database size ({SizeMb:F0} MB) exceeds {Threshold} MB — archiving all data and resetting database",
+                    _duckDb!.GetDatabaseSizeMb(), ArchiveSizeThresholdMb);
+                await _archiveService.ArchiveAllAndResetAsync();
+            }
+            else
+            {
+                await _archiveService.ArchiveOldDataAsync(hotDataDays: 7);
+            }
             _lastArchiveTime = DateTime.UtcNow;
         }
         catch (Exception ex)
@@ -168,36 +182,4 @@ private void RunRetentionIfDue()
         }
     }
 
-    private async Task RunCompactionIfDueAsync()
-    {
-        if (_duckDb == null || DateTime.UtcNow - _lastCompactionTime < CompactionInterval)
-        {
-            /* Size watchdog: warn if database is large even between compaction cycles */
-            if (_duckDb != null)
-            {
-                var sizeMb = _duckDb.GetDatabaseSizeMb();
-                if (sizeMb > SizeWarningThresholdMb)
-                {
-                    _logger?.LogWarning("Database size is {SizeMb:F0} MB (threshold: {Threshold} MB) — compaction will run at next scheduled interval",
-                        sizeMb, SizeWarningThresholdMb);
-                }
-            }
-            return;
-        }
-
-        try
-        {
-            IsPaused = true;
-            await _duckDb.CompactAsync();
-            _lastCompactionTime = DateTime.UtcNow;
-        }
-        catch (Exception ex)
-        {
-            _logger?.LogError(ex, "Database compaction failed");
-        }
-        finally
-        {
-            IsPaused = false;
-        }
-    }
 }
diff --git a/Lite/Services/DeltaCalculator.cs b/Lite/Services/DeltaCalculator.cs
index 6f7490b4..55ff9105 100644
--- a/Lite/Services/DeltaCalculator.cs
+++ b/Lite/Services/DeltaCalculator.cs
@@ -49,8 +49,7 @@ public async Task SeedFromDatabaseAsync(DuckDbInitializer duckDb)
             await SeedWaitStatsAsync(connection);
             await SeedFileIoStatsAsync(connection);
             await SeedPerfmonStatsAsync(connection);
-            await SeedQueryStatsAsync(connection);
-            await SeedProcedureStatsAsync(connection);
+            await SeedMemoryGrantStatsAsync(connection);
 
             _logger?.LogInformation("Delta calculator seeded from database");
         }
@@ -62,8 +61,8 @@ public async Task SeedFromDatabaseAsync(DuckDbInitializer duckDb)
 
     /// <summary>
     /// Calculates the delta between the current value and the previous cached value.
-    /// Returns 0 if this is the first collection (no previous value).
-    /// Returns the current value if the delta would be negative (counter reset).
+    /// First-ever sighting (no baseline): returns currentValue so single-execution queries appear.
+    /// Counter reset (value decreased): returns 0 to avoid inflated deltas from plan cache churn.
     /// Thread-safe via atomic AddOrUpdate.
     /// </summary>
     public long CalculateDelta(int serverId, string collectorName, string key, long currentValue)
@@ -75,17 +74,18 @@ public long CalculateDelta(int serverId, string collectorName, string key, long
 
         collectorCache.AddOrUpdate(
             key,
-            /* Add: first time seeing this key, delta = 0 */
+            /* Add: first time seeing this key — use current value as delta
+               so queries that execute once still surface in top-N views */
             _ =>
             {
-                delta = 0;
+                delta = currentValue;
                 return currentValue;
             },
             /* Update: compute delta atomically */
             (_, previousValue) =>
             {
                 delta = currentValue < previousValue
-                    ? currentValue   /* counter reset */
+                    ? 0              /* counter reset (plan cache eviction/re-entry) — not real new work */
                     : currentValue - previousValue;
                 return currentValue;
             });
@@ -158,55 +158,35 @@ FROM perfmon_stats
         if (count > 0) _logger?.LogDebug("Seeded {Count} perfmon_stats baseline rows", count);
     }
 
-    private async Task SeedQueryStatsAsync(DuckDBConnection connection)
+    private async Task SeedMemoryGrantStatsAsync(DuckDBConnection connection)
     {
-        using var cmd = connection.CreateCommand();
-        cmd.CommandText = @"
-SELECT server_id, query_hash, execution_count, total_worker_time, total_elapsed_time,
-       total_logical_reads, total_rows
-FROM query_stats
-WHERE (server_id, collection_time) IN (
-    SELECT server_id, MAX(collection_time) FROM query_stats GROUP BY server_id
-)";
-        using var reader = await cmd.ExecuteReaderAsync();
-        var count = 0;
-        while (await reader.ReadAsync())
+        try
         {
-            var serverId = reader.GetInt32(0);
-            var hash = reader.IsDBNull(1) ? "" : reader.GetString(1);
-            Seed(serverId, "query_stats_exec", hash, reader.GetInt64(2));
-            Seed(serverId, "query_stats_worker", hash, reader.GetInt64(3));
-            Seed(serverId, "query_stats_elapsed", hash, reader.GetInt64(4));
-            Seed(serverId, "query_stats_reads", hash, reader.GetInt64(5));
-            Seed(serverId, "query_stats_rows", hash, reader.GetInt64(6));
-            count++;
-        }
-        if (count > 0) _logger?.LogDebug("Seeded {Count} query_stats baseline rows", count);
-    }
-
-    private async Task SeedProcedureStatsAsync(DuckDBConnection connection)
-    {
-        using var cmd = connection.CreateCommand();
-        cmd.CommandText = @"
-SELECT server_id, database_name, schema_name, object_name, execution_count, total_worker_time, total_elapsed_time
-FROM procedure_stats
+            using var cmd = connection.CreateCommand();
+            cmd.CommandText = @"
+SELECT server_id, pool_id, resource_semaphore_id, timeout_error_count, forced_grant_count
+FROM memory_grant_stats
 WHERE (server_id, collection_time) IN (
-    SELECT server_id, MAX(collection_time) FROM procedure_stats GROUP BY server_id
+    SELECT server_id, MAX(collection_time) FROM memory_grant_stats GROUP BY server_id
 )";
-        using var reader = await cmd.ExecuteReaderAsync();
-        var count = 0;
-        while (await reader.ReadAsync())
+            using var reader = await cmd.ExecuteReaderAsync();
+            var count = 0;
+            while (await reader.ReadAsync())
+            {
+                var serverId = reader.GetInt32(0);
+                var poolId = reader.IsDBNull(1) ? 0 : reader.GetInt32(1);
+                var semaphoreId = reader.IsDBNull(2) ? (short)0 : reader.GetInt16(2);
+                var deltaKey = $"{poolId}_{semaphoreId}";
+                Seed(serverId, "memory_grants_timeouts", deltaKey, reader.IsDBNull(3) ? 0 : reader.GetInt64(3));
+                Seed(serverId, "memory_grants_forced", deltaKey, reader.IsDBNull(4) ? 0 : reader.GetInt64(4));
+                count++;
+            }
+            if (count > 0) _logger?.LogDebug("Seeded {Count} memory_grant_stats baseline rows", count);
+        }
+        catch
         {
-            var serverId = reader.GetInt32(0);
-            var db = reader.IsDBNull(1) ? "" : reader.GetString(1);
-            var schema = reader.IsDBNull(2) ? "" : reader.GetString(2);
-            var obj = reader.IsDBNull(3) ? "" : reader.GetString(3);
-            var key = $"{db}.{schema}.{obj}";
-            Seed(serverId, "proc_stats_exec", key, reader.GetInt64(4));
-            Seed(serverId, "proc_stats_worker", key, reader.GetInt64(5));
-            Seed(serverId, "proc_stats_elapsed", key, reader.GetInt64(6));
-            count++;
+            /* Table may not exist on first run after schema migration */
         }
-        if (count > 0) _logger?.LogDebug("Seeded {Count} procedure_stats baseline rows", count);
     }
+
 }
diff --git a/Lite/Services/LocalDataService.Blocking.cs b/Lite/Services/LocalDataService.Blocking.cs
index e82f781d..4ef859f6 100644
--- a/Lite/Services/LocalDataService.Blocking.cs
+++ b/Lite/Services/LocalDataService.Blocking.cs
@@ -138,7 +138,12 @@ public async Task<List<QuerySnapshotRow>> GetLatestQuerySnapshotsAsync(int serve
     parallel_worker_count,
     query_plan,
     live_query_plan,
-    collection_time
+    collection_time,
+    login_name,
+    host_name,
+    program_name,
+    open_transaction_count,
+    percent_complete
 FROM v_query_snapshots
 WHERE server_id = $1
 AND   collection_time >= $2
@@ -176,7 +181,12 @@ AND   query_text NOT LIKE 'WAITFOR%'
                 ParallelWorkerCount = reader.IsDBNull(17) ? 0 : reader.GetInt32(17),
                 QueryPlan = reader.IsDBNull(18) ? null : reader.GetString(18),
                 LiveQueryPlan = reader.IsDBNull(19) ? null : reader.GetString(19),
-                CollectionTime = reader.IsDBNull(20) ? DateTime.MinValue : reader.GetDateTime(20)
+                CollectionTime = reader.IsDBNull(20) ? DateTime.MinValue : reader.GetDateTime(20),
+                LoginName = reader.IsDBNull(21) ? "" : reader.GetString(21),
+                HostName = reader.IsDBNull(22) ? "" : reader.GetString(22),
+                ProgramName = reader.IsDBNull(23) ? "" : reader.GetString(23),
+                OpenTransactionCount = reader.IsDBNull(24) ? 0 : reader.GetInt32(24),
+                PercentComplete = reader.IsDBNull(25) ? 0m : Convert.ToDecimal(reader.GetValue(25))
             });
         }
 
@@ -377,6 +387,63 @@ GROUP BY DATE_TRUNC('hour', deadlock_time)
         }
         return items;
     }
+    /// <summary>
+    /// Gets lock wait stats trend data (LCK% wait types) for the blocking trends chart.
+    /// Returns per-second rates grouped by wait type.
+    /// </summary>
+    public async Task<List<LockWaitTrendPoint>> GetLockWaitTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+WITH raw AS
+(
+    SELECT
+        collection_time,
+        wait_type,
+        delta_wait_time_ms,
+        date_diff('second', LAG(collection_time) OVER (PARTITION BY wait_type ORDER BY collection_time), collection_time) AS interval_seconds
+    FROM v_wait_stats
+    WHERE server_id = $1
+    AND   wait_type LIKE 'LCK%'
+    AND   collection_time >= $2
+    AND   collection_time <= $3
+)
+SELECT
+    collection_time,
+    wait_type,
+    CASE WHEN interval_seconds > 0 THEN CAST(delta_wait_time_ms AS DOUBLE) / interval_seconds ELSE 0 END AS wait_time_ms_per_second
+FROM raw
+WHERE delta_wait_time_ms >= 0
+ORDER BY collection_time, wait_type";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<LockWaitTrendPoint>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new LockWaitTrendPoint
+            {
+                CollectionTime = reader.GetDateTime(0),
+                WaitType = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
+                WaitTimeMsPerSecond = reader.IsDBNull(2) ? 0 : reader.GetDouble(2)
+            });
+        }
+        return items;
+    }
+}
+
+public class LockWaitTrendPoint
+{
+    public DateTime CollectionTime { get; set; }
+    public string WaitType { get; set; } = string.Empty;
+    public double WaitTimeMsPerSecond { get; set; }
 }
 
 public class TrendPoint
@@ -688,6 +755,11 @@ public class QuerySnapshotRow
     public DateTime CollectionTime { get; set; }
     public string? QueryPlan { get; set; }
     public string? LiveQueryPlan { get; set; }
+    public string LoginName { get; set; } = "";
+    public string HostName { get; set; } = "";
+    public string ProgramName { get; set; } = "";
+    public int OpenTransactionCount { get; set; }
+    public decimal PercentComplete { get; set; }
     public bool HasQueryPlan => !string.IsNullOrEmpty(QueryPlan);
     public bool HasLiveQueryPlan => !string.IsNullOrEmpty(LiveQueryPlan);
     public string CollectionTimeLocal => CollectionTime == DateTime.MinValue ? "" : ServerTimeHelper.FormatServerTime(CollectionTime);
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index b93bfb76..19c47eb5 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -113,6 +113,55 @@ ORDER BY collection_time DESC
 
         return items;
     }
+
+    /// <summary>
+    /// Gets collection log entries for a specific collector on a server.
+    /// </summary>
+    public async Task<List<CollectionLogRow>> GetCollectionLogByCollectorAsync(int serverId, string collectorName, int hoursBack = 168)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+        command.CommandText = @"
+SELECT
+    collector_name,
+    collection_time,
+    duration_ms,
+    sql_duration_ms,
+    duckdb_duration_ms,
+    rows_collected,
+    status,
+    error_message,
+    server_name
+FROM v_collection_log
+WHERE server_id = $1
+AND   collector_name = $2
+AND   collection_time >= $3
+ORDER BY collection_time DESC";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = collectorName });
+        command.Parameters.Add(new DuckDBParameter { Value = DateTime.UtcNow.AddHours(-hoursBack) });
+
+        var items = new List<CollectionLogRow>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new CollectionLogRow
+            {
+                CollectorName = reader.GetString(0),
+                CollectionTime = reader.GetDateTime(1),
+                DurationMs = reader.IsDBNull(2) ? null : (int?)Convert.ToInt32(reader.GetValue(2)),
+                SqlDurationMs = reader.IsDBNull(3) ? null : (int?)Convert.ToInt32(reader.GetValue(3)),
+                DuckDbDurationMs = reader.IsDBNull(4) ? null : (int?)Convert.ToInt32(reader.GetValue(4)),
+                RowsCollected = reader.IsDBNull(5) ? null : (int?)Convert.ToInt32(reader.GetValue(5)),
+                Status = reader.GetString(6),
+                ErrorMessage = reader.IsDBNull(7) ? null : reader.GetString(7),
+                ServerName = reader.IsDBNull(8) ? null : reader.GetString(8)
+            });
+        }
+
+        return items;
+    }
 }
 
 public class CollectionLogRow
diff --git a/Lite/Services/LocalDataService.DailySummary.cs b/Lite/Services/LocalDataService.DailySummary.cs
new file mode 100644
index 00000000..fdd2dd0e
--- /dev/null
+++ b/Lite/Services/LocalDataService.DailySummary.cs
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using DuckDB.NET.Data;
+
+namespace PerformanceMonitorLite.Services;
+
+public partial class LocalDataService
+{
+    /// <summary>
+    /// Gets daily summary for a specific date (or today if null).
+    /// </summary>
+    public async Task<DailySummaryRow?> GetDailySummaryAsync(int serverId, DateTime? summaryDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var targetDate = summaryDate?.Date ?? DateTime.UtcNow.Date;
+        var dayStart = targetDate;
+        var dayEnd = targetDate.AddDays(1);
+
+        command.CommandText = @"
+SELECT
+    COALESCE(
+        (SELECT SUM(delta_wait_time_ms) / 1000.0
+         FROM v_wait_stats
+         WHERE server_id = $1
+         AND   collection_time >= $2 AND collection_time < $3
+         AND   delta_wait_time_ms > 0), 0
+    ) AS total_wait_sec,
+    (SELECT wait_type
+     FROM v_wait_stats
+     WHERE server_id = $1
+     AND   collection_time >= $2 AND collection_time < $3
+     AND   delta_wait_time_ms > 0
+     ORDER BY delta_wait_time_ms DESC
+     LIMIT 1
+    ) AS top_wait_type,
+    COALESCE(
+        (SELECT COUNT(DISTINCT query_hash)
+         FROM v_query_stats
+         WHERE server_id = $1
+         AND   collection_time >= $2 AND collection_time < $3), 0
+    ) AS unique_queries,
+    COALESCE(
+        (SELECT COUNT(*)
+         FROM v_deadlocks
+         WHERE server_id = $1
+         AND   collection_time >= $2 AND collection_time < $3), 0
+    ) AS deadlock_count,
+    COALESCE(
+        (SELECT COUNT(*)
+         FROM v_blocked_process_reports
+         WHERE server_id = $1
+         AND   collection_time >= $2 AND collection_time < $3), 0
+    ) AS blocking_events,
+    COALESCE(
+        (SELECT COUNT(*)
+         FROM v_cpu_utilization_stats
+         WHERE server_id = $1
+         AND   sqlserver_cpu_utilization >= 80
+         AND   collection_time >= $2 AND collection_time < $3), 0
+    ) AS high_cpu_events,
+    COALESCE(
+        (SELECT COUNT(*)
+         FROM v_collection_log
+         WHERE server_id = $1
+         AND   status = 'ERROR'
+         AND   collection_time >= $2 AND collection_time < $3), 0
+    ) AS collection_errors";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = dayStart });
+        command.Parameters.Add(new DuckDBParameter { Value = dayEnd });
+
+        using var reader = await command.ExecuteReaderAsync();
+        if (!await reader.ReadAsync()) return null;
+
+        var deadlocks = reader.IsDBNull(3) ? 0L : Convert.ToInt64(reader.GetValue(3));
+        var blocking = reader.IsDBNull(4) ? 0L : Convert.ToInt64(reader.GetValue(4));
+        var highCpu = reader.IsDBNull(5) ? 0L : Convert.ToInt64(reader.GetValue(5));
+
+        var health = "NORMAL";
+        if (deadlocks > 0) health = "DEADLOCKS";
+        else if (highCpu > 5) health = "CPU_CRITICAL";
+        else if (blocking > 10) health = "BLOCKING";
+
+        return new DailySummaryRow
+        {
+            SummaryDate = targetDate,
+            TotalWaitTimeSec = reader.IsDBNull(0) ? 0m : Convert.ToDecimal(reader.GetValue(0)),
+            TopWaitType = reader.IsDBNull(1) ? "" : reader.GetString(1),
+            UniqueQueries = reader.IsDBNull(2) ? 0L : Convert.ToInt64(reader.GetValue(2)),
+            DeadlockCount = deadlocks,
+            BlockingEvents = blocking,
+            HighCpuEvents = highCpu,
+            CollectionErrors = reader.IsDBNull(6) ? 0L : Convert.ToInt64(reader.GetValue(6)),
+            OverallHealth = health
+        };
+    }
+}
+
+public class DailySummaryRow
+{
+    public DateTime SummaryDate { get; set; }
+    public decimal TotalWaitTimeSec { get; set; }
+    public string TopWaitType { get; set; } = "";
+    public long UniqueQueries { get; set; }
+    public long DeadlockCount { get; set; }
+    public long BlockingEvents { get; set; }
+    public long HighCpuEvents { get; set; }
+    public long CollectionErrors { get; set; }
+    public string OverallHealth { get; set; } = "";
+
+    public string SummaryDateFormatted => SummaryDate.ToString("yyyy-MM-dd");
+    public string TotalWaitFormatted => TotalWaitTimeSec < 1000
+        ? $"{TotalWaitTimeSec:N1} s"
+        : $"{TotalWaitTimeSec / 60:N1} min";
+}
diff --git a/Lite/Services/LocalDataService.FileIo.cs b/Lite/Services/LocalDataService.FileIo.cs
index 3b1dfbe0..15cd4109 100644
--- a/Lite/Services/LocalDataService.FileIo.cs
+++ b/Lite/Services/LocalDataService.FileIo.cs
@@ -66,7 +66,7 @@ FROM v_file_io_stats
     }
 
     /// <summary>
-    /// Gets file I/O latency trend data broken down by database for charting.
+    /// Gets file I/O latency trend data broken down by file for charting (top 10 files by I/O activity).
     /// </summary>
     public async Task<List<FileIoTrendPoint>> GetFileIoLatencyTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
     {
@@ -76,17 +76,40 @@ public async Task<List<FileIoTrendPoint>> GetFileIoLatencyTrendAsync(int serverI
         var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
 
         command.CommandText = @"
+WITH top_files AS (
+    SELECT database_name, file_name
+    FROM v_file_io_stats
+    WHERE server_id = $1
+    AND   collection_time >= $2
+    AND   collection_time <= $3
+    AND   (delta_reads > 0 OR delta_writes > 0)
+    GROUP BY database_name, file_name
+    ORDER BY SUM(delta_reads + delta_writes) DESC
+    LIMIT 10
+)
 SELECT
-    collection_time,
-    database_name,
-    CASE WHEN SUM(delta_reads) > 0 THEN SUM(CAST(delta_stall_read_ms AS DOUBLE)) / SUM(delta_reads) ELSE 0 END AS avg_read_latency_ms,
-    CASE WHEN SUM(delta_writes) > 0 THEN SUM(CAST(delta_stall_write_ms AS DOUBLE)) / SUM(delta_writes) ELSE 0 END AS avg_write_latency_ms
-FROM v_file_io_stats
-WHERE server_id = $1
-AND   collection_time >= $2
-AND   collection_time <= $3
-GROUP BY collection_time, database_name
-ORDER BY collection_time, database_name";
+    f.collection_time,
+    f.database_name,
+    f.file_name,
+    CASE WHEN SUM(f.delta_reads) > 0
+         THEN SUM(CAST(f.delta_stall_read_ms AS DOUBLE)) / SUM(f.delta_reads)
+         ELSE 0 END AS avg_read_latency_ms,
+    CASE WHEN SUM(f.delta_writes) > 0
+         THEN SUM(CAST(f.delta_stall_write_ms AS DOUBLE)) / SUM(f.delta_writes)
+         ELSE 0 END AS avg_write_latency_ms,
+    CASE WHEN SUM(f.delta_reads) > 0
+         THEN SUM(CAST(COALESCE(f.delta_stall_queued_read_ms, 0) AS DOUBLE)) / SUM(f.delta_reads)
+         ELSE 0 END AS avg_queued_read_latency_ms,
+    CASE WHEN SUM(f.delta_writes) > 0
+         THEN SUM(CAST(COALESCE(f.delta_stall_queued_write_ms, 0) AS DOUBLE)) / SUM(f.delta_writes)
+         ELSE 0 END AS avg_queued_write_latency_ms
+FROM v_file_io_stats f
+JOIN top_files tf ON tf.database_name = f.database_name AND tf.file_name = f.file_name
+WHERE f.server_id = $1
+AND   f.collection_time >= $2
+AND   f.collection_time <= $3
+GROUP BY f.collection_time, f.database_name, f.file_name
+ORDER BY f.collection_time, f.database_name, f.file_name";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
         command.Parameters.Add(new DuckDBParameter { Value = startTime });
@@ -100,8 +123,83 @@ FROM v_file_io_stats
             {
                 CollectionTime = reader.GetDateTime(0),
                 DatabaseName = reader.IsDBNull(1) ? "" : reader.GetString(1),
-                AvgReadLatencyMs = reader.IsDBNull(2) ? 0 : ToDouble(reader.GetValue(2)),
-                AvgWriteLatencyMs = reader.IsDBNull(3) ? 0 : ToDouble(reader.GetValue(3))
+                FileName = reader.IsDBNull(2) ? "" : reader.GetString(2),
+                AvgReadLatencyMs = reader.IsDBNull(3) ? 0 : ToDouble(reader.GetValue(3)),
+                AvgWriteLatencyMs = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4)),
+                AvgQueuedReadLatencyMs = reader.IsDBNull(5) ? 0 : ToDouble(reader.GetValue(5)),
+                AvgQueuedWriteLatencyMs = reader.IsDBNull(6) ? 0 : ToDouble(reader.GetValue(6))
+            });
+        }
+
+        return items;
+    }
+
+    /// <summary>
+    /// Gets file I/O throughput trend data (MB/s) broken down by file for charting.
+    /// Uses LAG() window function to compute collection interval for per-second calculation.
+    /// </summary>
+    public async Task<List<FileIoThroughputPoint>> GetFileIoThroughputTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+WITH top_files AS (
+    SELECT database_name, file_name
+    FROM v_file_io_stats
+    WHERE server_id = $1
+    AND   collection_time >= $2
+    AND   collection_time <= $3
+    AND   (delta_read_bytes > 0 OR delta_write_bytes > 0)
+    GROUP BY database_name, file_name
+    ORDER BY SUM(delta_read_bytes + delta_write_bytes) DESC
+    LIMIT 10
+),
+with_interval AS (
+    SELECT
+        f.collection_time,
+        f.database_name || '.' || f.file_name AS file_label,
+        f.delta_read_bytes,
+        f.delta_write_bytes,
+        EXTRACT(EPOCH FROM (f.collection_time - LAG(f.collection_time) OVER (
+            PARTITION BY f.server_id, f.database_name, f.file_name
+            ORDER BY f.collection_time
+        ))) AS interval_seconds
+    FROM v_file_io_stats f
+    JOIN top_files tf ON tf.database_name = f.database_name AND tf.file_name = f.file_name
+    WHERE f.server_id = $1
+    AND   f.collection_time >= $2
+    AND   f.collection_time <= $3
+)
+SELECT
+    collection_time,
+    file_label,
+    CASE WHEN interval_seconds > 0
+         THEN CAST(delta_read_bytes AS DOUBLE) / interval_seconds / 1048576.0
+         ELSE 0 END AS read_mb_per_sec,
+    CASE WHEN interval_seconds > 0
+         THEN CAST(delta_write_bytes AS DOUBLE) / interval_seconds / 1048576.0
+         ELSE 0 END AS write_mb_per_sec
+FROM with_interval
+WHERE interval_seconds IS NOT NULL AND interval_seconds > 0
+ORDER BY collection_time, file_label";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<FileIoThroughputPoint>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new FileIoThroughputPoint
+            {
+                CollectionTime = reader.GetDateTime(0),
+                FileLabel = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                ReadMbPerSec = reader.IsDBNull(2) ? 0 : ToDouble(reader.GetValue(2)),
+                WriteMbPerSec = reader.IsDBNull(3) ? 0 : ToDouble(reader.GetValue(3))
             });
         }
 
@@ -157,8 +255,19 @@ public class FileIoTrendPoint
 {
     public DateTime CollectionTime { get; set; }
     public string DatabaseName { get; set; } = "";
+    public string FileName { get; set; } = "";
     public double AvgReadLatencyMs { get; set; }
     public double AvgWriteLatencyMs { get; set; }
+    public double AvgQueuedReadLatencyMs { get; set; }
+    public double AvgQueuedWriteLatencyMs { get; set; }
+}
+
+public class FileIoThroughputPoint
+{
+    public DateTime CollectionTime { get; set; }
+    public string FileLabel { get; set; } = "";
+    public double ReadMbPerSec { get; set; }
+    public double WriteMbPerSec { get; set; }
 }
 
 public class FileIoRow
diff --git a/Lite/Services/LocalDataService.Memory.cs b/Lite/Services/LocalDataService.Memory.cs
index 55869c47..3b581927 100644
--- a/Lite/Services/LocalDataService.Memory.cs
+++ b/Lite/Services/LocalDataService.Memory.cs
@@ -108,6 +108,79 @@ FROM v_memory_stats
         return items;
     }
 
+    /// <summary>
+    /// Gets the distinct memory clerk types collected for a server, ordered by total memory descending.
+    /// </summary>
+    public async Task<List<string>> GetDistinctMemoryClerkTypesAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+SELECT
+    clerk_type
+FROM v_memory_clerks
+WHERE server_id = $1
+AND   collection_time >= $2
+AND   collection_time <= $3
+GROUP BY clerk_type
+ORDER BY SUM(memory_mb) DESC";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<string>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(reader.GetString(0));
+        }
+        return items;
+    }
+
+    /// <summary>
+    /// Gets memory clerk trend data for a single clerk type for charting.
+    /// </summary>
+    public async Task<List<MemoryClerkTrendPoint>> GetMemoryClerkTrendAsync(int serverId, string clerkType, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+SELECT
+    collection_time,
+    memory_mb
+FROM v_memory_clerks
+WHERE server_id = $1
+AND   clerk_type = $2
+AND   collection_time >= $3
+AND   collection_time <= $4
+ORDER BY collection_time";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = clerkType });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<MemoryClerkTrendPoint>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new MemoryClerkTrendPoint
+            {
+                CollectionTime = reader.GetDateTime(0),
+                MemoryMb = reader.IsDBNull(1) ? 0 : ToDouble(reader.GetValue(1))
+            });
+        }
+
+        return items;
+    }
+
     /// <summary>
     /// Gets the latest memory clerk breakdown.
     /// </summary>
@@ -172,3 +245,10 @@ public class MemoryClerkRow
     public double MemoryMb { get; set; }
     public string MemoryFormatted => MemoryMb >= 1024 ? $"{MemoryMb / 1024:F1} GB" : $"{MemoryMb:F1} MB";
 }
+
+public class MemoryClerkTrendPoint
+{
+    public DateTime CollectionTime { get; set; }
+    public string ClerkType { get; set; } = "";
+    public double MemoryMb { get; set; }
+}
diff --git a/Lite/Services/LocalDataService.MemoryGrants.cs b/Lite/Services/LocalDataService.MemoryGrants.cs
index 77766e63..eb93033f 100644
--- a/Lite/Services/LocalDataService.MemoryGrants.cs
+++ b/Lite/Services/LocalDataService.MemoryGrants.cs
@@ -16,66 +16,51 @@ namespace PerformanceMonitorLite.Services;
 public partial class LocalDataService
 {
     /// <summary>
-    /// Gets the most recent memory grant snapshot for a server.
+    /// Gets memory grant trend — total granted MB per collection snapshot for the Memory Overview overlay.
     /// </summary>
-    public async Task<List<MemoryGrantStatsRow>> GetMemoryGrantStatsAsync(int serverId, int hoursBack = 1)
+    public async Task<List<MemoryTrendPoint>> GetMemoryGrantTrendAsync(int serverId, int hoursBack = 4, DateTime? fromDate = null, DateTime? toDate = null)
     {
         using var connection = await OpenConnectionAsync();
         using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
         command.CommandText = @"
 SELECT
     collection_time,
-    session_id,
-    database_name,
-    query_text,
-    requested_memory_mb,
-    granted_memory_mb,
-    used_memory_mb,
-    max_used_memory_mb,
-    ideal_memory_mb,
-    required_memory_mb,
-    wait_time_ms,
-    is_small_grant,
-    dop,
-    query_cost
+    0 AS total_server_memory_mb,
+    0 AS target_server_memory_mb,
+    0 AS buffer_pool_mb,
+    SUM(granted_memory_mb) AS total_granted_mb
 FROM memory_grant_stats
 WHERE server_id = $1
 AND   collection_time >= $2
-ORDER BY collection_time DESC, granted_memory_mb DESC";
+AND   collection_time <= $3
+GROUP BY collection_time
+ORDER BY collection_time";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
-        command.Parameters.Add(new DuckDBParameter { Value = DateTime.UtcNow.AddHours(-hoursBack) });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
 
-        var items = new List<MemoryGrantStatsRow>();
+        var items = new List<MemoryTrendPoint>();
         using var reader = await command.ExecuteReaderAsync();
         while (await reader.ReadAsync())
         {
-            items.Add(new MemoryGrantStatsRow
+            items.Add(new MemoryTrendPoint
             {
                 CollectionTime = reader.GetDateTime(0),
-                SessionId = reader.IsDBNull(1) ? 0 : reader.GetInt32(1),
-                DatabaseName = reader.IsDBNull(2) ? "" : reader.GetString(2),
-                QueryText = reader.IsDBNull(3) ? "" : reader.GetString(3),
-                RequestedMemoryMb = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4)),
-                GrantedMemoryMb = reader.IsDBNull(5) ? 0 : ToDouble(reader.GetValue(5)),
-                UsedMemoryMb = reader.IsDBNull(6) ? 0 : ToDouble(reader.GetValue(6)),
-                MaxUsedMemoryMb = reader.IsDBNull(7) ? 0 : ToDouble(reader.GetValue(7)),
-                IdealMemoryMb = reader.IsDBNull(8) ? 0 : ToDouble(reader.GetValue(8)),
-                RequiredMemoryMb = reader.IsDBNull(9) ? 0 : ToDouble(reader.GetValue(9)),
-                WaitTimeMs = reader.IsDBNull(10) ? 0 : ToInt64(reader.GetValue(10)),
-                IsSmallGrant = !reader.IsDBNull(11) && reader.GetBoolean(11),
-                Dop = reader.IsDBNull(12) ? 0 : reader.GetInt32(12),
-                QueryCost = reader.IsDBNull(13) ? 0 : ToDouble(reader.GetValue(13))
+                TotalGrantedMb = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4))
             });
         }
-
         return items;
     }
 
     /// <summary>
-    /// Gets memory grant trend — total granted MB per collection snapshot for charting.
+    /// Gets memory grant chart data aggregated by collection_time and pool_id
+    /// for the Memory Grants sub-tab charts.
     /// </summary>
-    public async Task<List<MemoryTrendPoint>> GetMemoryGrantTrendAsync(int serverId, int hoursBack = 4, DateTime? fromDate = null, DateTime? toDate = null)
+    public async Task<List<MemoryGrantChartPoint>> GetMemoryGrantChartDataAsync(int serverId, int hoursBack = 4, DateTime? fromDate = null, DateTime? toDate = null)
     {
         using var connection = await OpenConnectionAsync();
         using var command = connection.CreateCommand();
@@ -85,53 +70,56 @@ public async Task<List<MemoryTrendPoint>> GetMemoryGrantTrendAsync(int serverId,
         command.CommandText = @"
 SELECT
     collection_time,
-    0 AS total_server_memory_mb,
-    0 AS target_server_memory_mb,
-    0 AS buffer_pool_mb,
-    SUM(granted_memory_mb) AS total_granted_mb
+    pool_id,
+    SUM(available_memory_mb) AS available_memory_mb,
+    SUM(granted_memory_mb) AS granted_memory_mb,
+    SUM(used_memory_mb) AS used_memory_mb,
+    SUM(grantee_count) AS grantee_count,
+    SUM(waiter_count) AS waiter_count,
+    SUM(timeout_error_count_delta) AS timeout_error_count_delta,
+    SUM(forced_grant_count_delta) AS forced_grant_count_delta
 FROM memory_grant_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
-GROUP BY collection_time
-ORDER BY collection_time";
+AND   granted_memory_mb > 0
+GROUP BY collection_time, pool_id
+ORDER BY collection_time, pool_id";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
         command.Parameters.Add(new DuckDBParameter { Value = startTime });
         command.Parameters.Add(new DuckDBParameter { Value = endTime });
 
-        var items = new List<MemoryTrendPoint>();
+        var items = new List<MemoryGrantChartPoint>();
         using var reader = await command.ExecuteReaderAsync();
         while (await reader.ReadAsync())
         {
-            items.Add(new MemoryTrendPoint
+            items.Add(new MemoryGrantChartPoint
             {
                 CollectionTime = reader.GetDateTime(0),
-                TotalGrantedMb = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4))
+                PoolId = reader.IsDBNull(1) ? 0 : reader.GetInt32(1),
+                AvailableMemoryMb = reader.IsDBNull(2) ? 0 : ToDouble(reader.GetValue(2)),
+                GrantedMemoryMb = reader.IsDBNull(3) ? 0 : ToDouble(reader.GetValue(3)),
+                UsedMemoryMb = reader.IsDBNull(4) ? 0 : ToDouble(reader.GetValue(4)),
+                GranteeCount = reader.IsDBNull(5) ? 0 : (int)ToInt64(reader.GetValue(5)),
+                WaiterCount = reader.IsDBNull(6) ? 0 : (int)ToInt64(reader.GetValue(6)),
+                TimeoutErrorCountDelta = reader.IsDBNull(7) ? 0 : ToInt64(reader.GetValue(7)),
+                ForcedGrantCountDelta = reader.IsDBNull(8) ? 0 : ToInt64(reader.GetValue(8))
             });
         }
         return items;
     }
 }
 
-public class MemoryGrantStatsRow
+public class MemoryGrantChartPoint
 {
     public DateTime CollectionTime { get; set; }
-    public int SessionId { get; set; }
-    public string DatabaseName { get; set; } = "";
-    public string QueryText { get; set; } = "";
-    public double RequestedMemoryMb { get; set; }
+    public int PoolId { get; set; }
+    public double AvailableMemoryMb { get; set; }
     public double GrantedMemoryMb { get; set; }
     public double UsedMemoryMb { get; set; }
-    public double MaxUsedMemoryMb { get; set; }
-    public double IdealMemoryMb { get; set; }
-    public double RequiredMemoryMb { get; set; }
-    public long WaitTimeMs { get; set; }
-    public bool IsSmallGrant { get; set; }
-    public int Dop { get; set; }
-    public double QueryCost { get; set; }
-
-    public string GrantEfficiency => GrantedMemoryMb > 0
-        ? $"{MaxUsedMemoryMb / GrantedMemoryMb * 100:F0}%"
-        : "N/A";
+    public int GranteeCount { get; set; }
+    public int WaiterCount { get; set; }
+    public long TimeoutErrorCountDelta { get; set; }
+    public long ForcedGrantCountDelta { get; set; }
 }
diff --git a/Lite/Services/LocalDataService.QueryStats.cs b/Lite/Services/LocalDataService.QueryStats.cs
index 0ed8a34c..74a7467f 100644
--- a/Lite/Services/LocalDataService.QueryStats.cs
+++ b/Lite/Services/LocalDataService.QueryStats.cs
@@ -36,7 +36,7 @@ FROM sys.databases AS d
     /// <summary>
     /// Gets top queries by CPU for a server over a time period.
     /// </summary>
-    public async Task<List<QueryStatsRow>> GetTopQueriesByCpuAsync(int serverId, int hoursBack = 24, int top = 50, DateTime? fromDate = null, DateTime? toDate = null)
+    public async Task<List<QueryStatsRow>> GetTopQueriesByCpuAsync(int serverId, int hoursBack = 24, int top = 50, DateTime? fromDate = null, DateTime? toDate = null, int utcOffsetMinutes = 0)
     {
         using var connection = await OpenConnectionAsync();
         using var command = connection.CreateCommand();
@@ -61,6 +61,14 @@ public async Task<List<QueryStatsRow>> GetTopQueriesByCpuAsync(int serverId, int
     MAX(max_worker_time) AS max_worker_time,
     MIN(min_elapsed_time) AS min_elapsed_time,
     MAX(max_elapsed_time) AS max_elapsed_time,
+    MIN(min_physical_reads) AS min_physical_reads,
+    MAX(max_physical_reads) AS max_physical_reads,
+    MIN(min_rows) AS min_rows,
+    MAX(max_rows) AS max_rows,
+    MIN(min_grant_kb) AS min_grant_kb,
+    MAX(max_grant_kb) AS max_grant_kb,
+    MIN(min_spills) AS min_spills,
+    MAX(max_spills) AS max_spills,
     MAX(query_plan_hash) AS query_plan_hash,
     MAX(sql_handle) AS sql_handle,
     MAX(plan_handle) AS plan_handle,
@@ -70,8 +78,10 @@ FROM v_query_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
+AND   last_execution_time >= $2 + $5 * INTERVAL '1' MINUTE
 AND   query_text NOT LIKE 'WAITFOR%'
 GROUP BY database_name, query_hash
+HAVING SUM(delta_execution_count) > 0 OR SUM(delta_elapsed_time) > 0
 ORDER BY SUM(delta_elapsed_time) DESC
 LIMIT $4";
 
@@ -79,6 +89,7 @@ ORDER BY SUM(delta_elapsed_time) DESC
         command.Parameters.Add(new DuckDBParameter { Value = startTime });
         command.Parameters.Add(new DuckDBParameter { Value = endTime });
         command.Parameters.Add(new DuckDBParameter { Value = top });
+        command.Parameters.Add(new DuckDBParameter { Value = utcOffsetMinutes });
 
         var items = new List<QueryStatsRow>();
         using var reader = await command.ExecuteReaderAsync();
@@ -102,11 +113,19 @@ ORDER BY SUM(delta_elapsed_time) DESC
                 MaxCpuUs = reader.IsDBNull(13) ? 0 : reader.GetInt64(13),
                 MinElapsedUs = reader.IsDBNull(14) ? 0 : reader.GetInt64(14),
                 MaxElapsedUs = reader.IsDBNull(15) ? 0 : reader.GetInt64(15),
-                QueryPlanHash = reader.IsDBNull(16) ? "" : reader.GetString(16),
-                SqlHandle = reader.IsDBNull(17) ? "" : reader.GetString(17),
-                PlanHandle = reader.IsDBNull(18) ? "" : reader.GetString(18),
-                QueryText = reader.IsDBNull(19) ? "" : reader.GetString(19),
-                QueryPlan = reader.IsDBNull(20) ? null : reader.GetString(20)
+                MinPhysicalReads = reader.IsDBNull(16) ? 0 : reader.GetInt64(16),
+                MaxPhysicalReads = reader.IsDBNull(17) ? 0 : reader.GetInt64(17),
+                MinRows = reader.IsDBNull(18) ? 0 : reader.GetInt64(18),
+                MaxRows = reader.IsDBNull(19) ? 0 : reader.GetInt64(19),
+                MinGrantKb = reader.IsDBNull(20) ? 0 : reader.GetInt64(20),
+                MaxGrantKb = reader.IsDBNull(21) ? 0 : reader.GetInt64(21),
+                MinSpills = reader.IsDBNull(22) ? 0 : reader.GetInt64(22),
+                MaxSpills = reader.IsDBNull(23) ? 0 : reader.GetInt64(23),
+                QueryPlanHash = reader.IsDBNull(24) ? "" : reader.GetString(24),
+                SqlHandle = reader.IsDBNull(25) ? "" : reader.GetString(25),
+                PlanHandle = reader.IsDBNull(26) ? "" : reader.GetString(26),
+                QueryText = reader.IsDBNull(27) ? "" : reader.GetString(27),
+                QueryPlan = reader.IsDBNull(28) ? null : reader.GetString(28)
             });
         }
 
@@ -195,7 +214,12 @@ public async Task<List<ProcedureStatsHistoryRow>> GetProcedureStatsHistoryAsync(
     delta_elapsed_time,
     delta_logical_reads,
     delta_logical_writes,
-    delta_physical_reads
+    delta_physical_reads,
+    min_worker_time,
+    max_worker_time,
+    min_elapsed_time,
+    max_elapsed_time,
+    total_spills
 FROM v_procedure_stats
 WHERE server_id = $1
 AND   database_name = $2
@@ -222,13 +246,64 @@ FROM v_procedure_stats
                 DeltaElapsedUs = reader.IsDBNull(3) ? 0 : reader.GetInt64(3),
                 DeltaLogicalReads = reader.IsDBNull(4) ? 0 : reader.GetInt64(4),
                 DeltaLogicalWrites = reader.IsDBNull(5) ? 0 : reader.GetInt64(5),
-                DeltaPhysicalReads = reader.IsDBNull(6) ? 0 : reader.GetInt64(6)
+                DeltaPhysicalReads = reader.IsDBNull(6) ? 0 : reader.GetInt64(6),
+                MinWorkerTimeUs = reader.IsDBNull(7) ? 0 : reader.GetInt64(7),
+                MaxWorkerTimeUs = reader.IsDBNull(8) ? 0 : reader.GetInt64(8),
+                MinElapsedTimeUs = reader.IsDBNull(9) ? 0 : reader.GetInt64(9),
+                MaxElapsedTimeUs = reader.IsDBNull(10) ? 0 : reader.GetInt64(10),
+                TotalSpills = reader.IsDBNull(11) ? 0 : reader.GetInt64(11)
             });
         }
 
         return items;
     }
 
+    /// <summary>
+    /// Looks up a cached query plan from DuckDB by server_id and query_hash.
+    /// Returns the most recently collected plan XML, or null if not found.
+    /// </summary>
+    public async Task<string?> GetCachedQueryPlanAsync(int serverId, string queryHash)
+    {
+        const string query = @"
+SELECT query_plan_xml
+FROM v_query_stats
+WHERE server_id = $1
+AND   query_hash = $2
+AND   query_plan_xml IS NOT NULL
+AND   query_plan_xml <> ''
+ORDER BY collection_time DESC
+LIMIT 1";
+
+        using var connection = await OpenConnectionAsync();
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = query;
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = serverId });
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = queryHash });
+        var result = await cmd.ExecuteScalarAsync();
+        return result as string;
+    }
+
+    public async Task<string?> GetCachedProcedurePlanAsync(int serverId, string planHandle)
+    {
+        const string query = @"
+SELECT query_plan_xml
+FROM v_query_stats
+WHERE server_id = $1
+AND   plan_handle = $2
+AND   query_plan_xml IS NOT NULL
+AND   query_plan_xml <> ''
+ORDER BY collection_time DESC
+LIMIT 1";
+
+        using var connection = await OpenConnectionAsync();
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = query;
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = serverId });
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = planHandle });
+        var result = await cmd.ExecuteScalarAsync();
+        return result as string;
+    }
+
     /// <summary>
     /// Fetches a query plan on-demand from the remote server by query hash.
     /// </summary>
@@ -304,7 +379,7 @@ ps.total_elapsed_time DESC
     /// <summary>
     /// Gets top procedures by CPU for a server.
     /// </summary>
-    public async Task<List<ProcedureStatsRow>> GetTopProceduresByCpuAsync(int serverId, int hoursBack = 24, int top = 50, DateTime? fromDate = null, DateTime? toDate = null)
+    public async Task<List<ProcedureStatsRow>> GetTopProceduresByCpuAsync(int serverId, int hoursBack = 24, int top = 50, DateTime? fromDate = null, DateTime? toDate = null, int utcOffsetMinutes = 0)
     {
         using var connection = await OpenConnectionAsync();
         using var command = connection.CreateCommand();
@@ -327,14 +402,25 @@ public async Task<List<ProcedureStatsRow>> GetTopProceduresByCpuAsync(int server
     MAX(max_worker_time) AS max_worker_time,
     MIN(min_elapsed_time) AS min_elapsed_time,
     MAX(max_elapsed_time) AS max_elapsed_time,
+    MIN(min_logical_reads) AS min_logical_reads,
+    MAX(max_logical_reads) AS max_logical_reads,
+    MIN(min_physical_reads) AS min_physical_reads,
+    MAX(max_physical_reads) AS max_physical_reads,
+    MIN(min_logical_writes) AS min_logical_writes,
+    MAX(max_logical_writes) AS max_logical_writes,
     SUM(total_spills) AS total_spills,
+    MIN(min_spills) AS min_spills,
+    MAX(max_spills) AS max_spills,
+    MAX(cached_time) AS cached_time,
     MAX(sql_handle) AS sql_handle,
     MAX(plan_handle) AS plan_handle
 FROM v_procedure_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
+AND   last_execution_time >= $2 + $5 * INTERVAL '1' MINUTE
 GROUP BY database_name, schema_name, object_name, object_type
+HAVING SUM(delta_execution_count) > 0 OR SUM(delta_elapsed_time) > 0
 ORDER BY SUM(delta_elapsed_time) DESC
 LIMIT $4";
 
@@ -342,6 +428,7 @@ ORDER BY SUM(delta_elapsed_time) DESC
         command.Parameters.Add(new DuckDBParameter { Value = startTime });
         command.Parameters.Add(new DuckDBParameter { Value = endTime });
         command.Parameters.Add(new DuckDBParameter { Value = top });
+        command.Parameters.Add(new DuckDBParameter { Value = utcOffsetMinutes });
 
         var items = new List<ProcedureStatsRow>();
         using var reader = await command.ExecuteReaderAsync();
@@ -363,9 +450,18 @@ ORDER BY SUM(delta_elapsed_time) DESC
                 MaxWorkerTimeUs = reader.IsDBNull(11) ? 0 : reader.GetInt64(11),
                 MinElapsedTimeUs = reader.IsDBNull(12) ? 0 : reader.GetInt64(12),
                 MaxElapsedTimeUs = reader.IsDBNull(13) ? 0 : reader.GetInt64(13),
-                TotalSpills = reader.IsDBNull(14) ? 0 : reader.GetInt64(14),
-                SqlHandle = reader.IsDBNull(15) ? "" : reader.GetString(15),
-                PlanHandle = reader.IsDBNull(16) ? "" : reader.GetString(16)
+                MinLogicalReads = reader.IsDBNull(14) ? 0 : reader.GetInt64(14),
+                MaxLogicalReads = reader.IsDBNull(15) ? 0 : reader.GetInt64(15),
+                MinPhysicalReads = reader.IsDBNull(16) ? 0 : reader.GetInt64(16),
+                MaxPhysicalReads = reader.IsDBNull(17) ? 0 : reader.GetInt64(17),
+                MinLogicalWrites = reader.IsDBNull(18) ? 0 : reader.GetInt64(18),
+                MaxLogicalWrites = reader.IsDBNull(19) ? 0 : reader.GetInt64(19),
+                TotalSpills = reader.IsDBNull(20) ? 0 : reader.GetInt64(20),
+                MinSpills = reader.IsDBNull(21) ? 0 : reader.GetInt64(21),
+                MaxSpills = reader.IsDBNull(22) ? 0 : reader.GetInt64(22),
+                CachedTime = reader.IsDBNull(23) ? (DateTime?)null : reader.GetDateTime(23),
+                SqlHandle = reader.IsDBNull(24) ? "" : reader.GetString(24),
+                PlanHandle = reader.IsDBNull(25) ? "" : reader.GetString(25)
             });
         }
 
@@ -541,6 +637,14 @@ public class QueryStatsRow
     public long MaxCpuUs { get; set; }
     public long MinElapsedUs { get; set; }
     public long MaxElapsedUs { get; set; }
+    public long MinPhysicalReads { get; set; }
+    public long MaxPhysicalReads { get; set; }
+    public long MinRows { get; set; }
+    public long MaxRows { get; set; }
+    public long MinGrantKb { get; set; }
+    public long MaxGrantKb { get; set; }
+    public long MinSpills { get; set; }
+    public long MaxSpills { get; set; }
     public string QueryPlanHash { get; set; } = "";
     public string SqlHandle { get; set; } = "";
     public string PlanHandle { get; set; } = "";
@@ -574,7 +678,16 @@ public class ProcedureStatsRow
     public long MaxWorkerTimeUs { get; set; }
     public long MinElapsedTimeUs { get; set; }
     public long MaxElapsedTimeUs { get; set; }
+    public long MinLogicalReads { get; set; }
+    public long MaxLogicalReads { get; set; }
+    public long MinPhysicalReads { get; set; }
+    public long MaxPhysicalReads { get; set; }
+    public long MinLogicalWrites { get; set; }
+    public long MaxLogicalWrites { get; set; }
     public long TotalSpills { get; set; }
+    public long MinSpills { get; set; }
+    public long MaxSpills { get; set; }
+    public DateTime? CachedTime { get; set; }
     public string SqlHandle { get; set; } = "";
     public string PlanHandle { get; set; } = "";
     public string FullName => string.IsNullOrEmpty(SchemaName) ? ObjectName : $"{SchemaName}.{ObjectName}";
@@ -587,6 +700,7 @@ public class ProcedureStatsRow
     public double MaxCpuMs => MaxWorkerTimeUs / 1000.0;
     public double MinElapsedMs => MinElapsedTimeUs / 1000.0;
     public double MaxElapsedMs => MaxElapsedTimeUs / 1000.0;
+    public string CachedTimeFormatted => CachedTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "";
 }
 
 public class QueryStatsHistoryRow
@@ -630,10 +744,19 @@ public class ProcedureStatsHistoryRow
     public long DeltaLogicalReads { get; set; }
     public long DeltaLogicalWrites { get; set; }
     public long DeltaPhysicalReads { get; set; }
+    public long MinWorkerTimeUs { get; set; }
+    public long MaxWorkerTimeUs { get; set; }
+    public long MinElapsedTimeUs { get; set; }
+    public long MaxElapsedTimeUs { get; set; }
+    public long TotalSpills { get; set; }
     public double DeltaCpuMs => DeltaCpuUs / 1000.0;
     public double DeltaElapsedMs => DeltaElapsedUs / 1000.0;
     public double AvgCpuMs => DeltaExecutions > 0 ? DeltaCpuMs / DeltaExecutions : 0;
     public double AvgElapsedMs => DeltaExecutions > 0 ? DeltaElapsedMs / DeltaExecutions : 0;
     public double AvgReads => DeltaExecutions > 0 ? (double)DeltaLogicalReads / DeltaExecutions : 0;
+    public double MinCpuMs => MinWorkerTimeUs / 1000.0;
+    public double MaxCpuMs => MaxWorkerTimeUs / 1000.0;
+    public double MinElapsedMs => MinElapsedTimeUs / 1000.0;
+    public double MaxElapsedMs => MaxElapsedTimeUs / 1000.0;
     public string CollectionTimeLocal => ServerTimeHelper.FormatServerTime(CollectionTime);
 }
diff --git a/Lite/Services/LocalDataService.QueryStore.cs b/Lite/Services/LocalDataService.QueryStore.cs
index d68ae69c..368a64b3 100644
--- a/Lite/Services/LocalDataService.QueryStore.cs
+++ b/Lite/Services/LocalDataService.QueryStore.cs
@@ -19,7 +19,7 @@ public partial class LocalDataService
 {
     /// <summary>
     /// Gets the latest Query Store snapshot for a server, aggregated across all databases.
-    /// Shows top queries by total duration (execution_count * avg_duration_ms).
+    /// Shows top queries by total duration (execution_count * avg_duration).
     /// </summary>
     public async Task<List<QueryStoreRow>> GetQueryStoreTopQueriesAsync(int serverId, int hoursBack = 24, int top = 50, DateTime? fromDate = null, DateTime? toDate = null)
     {
@@ -35,22 +35,37 @@ public async Task<List<QueryStoreRow>> GetQueryStoreTopQueriesAsync(int serverId
     plan_id,
     query_hash,
     MAX(query_text) AS query_text,
+    MAX(module_name) AS module_name,
     SUM(execution_count) AS total_executions,
-    AVG(avg_duration_ms) AS avg_duration_ms,
-    AVG(avg_cpu_time_ms) AS avg_cpu_time_ms,
-    AVG(avg_logical_reads) AS avg_logical_reads,
-    AVG(avg_logical_writes) AS avg_logical_writes,
-    AVG(avg_physical_reads) AS avg_physical_reads,
-    AVG(avg_rowcount) AS avg_rowcount,
+    AVG(CAST(avg_duration_us AS DOUBLE)) / 1000.0 AS avg_duration_ms,
+    AVG(CAST(avg_cpu_time_us AS DOUBLE)) / 1000.0 AS avg_cpu_time_ms,
+    AVG(CAST(avg_logical_io_reads AS DOUBLE)) AS avg_logical_reads,
+    AVG(CAST(avg_logical_io_writes AS DOUBLE)) AS avg_logical_writes,
+    AVG(CAST(avg_physical_io_reads AS DOUBLE)) AS avg_physical_reads,
+    AVG(CAST(avg_rowcount AS DOUBLE)) AS avg_rowcount,
+    MIN(min_dop) AS min_dop,
+    MAX(max_dop) AS max_dop,
     MAX(last_execution_time) AS last_execution_time,
-    MAX(query_plan_hash) AS query_plan_hash
+    MAX(query_plan_hash) AS query_plan_hash,
+    MAX(CASE WHEN is_forced_plan THEN TRUE ELSE FALSE END) AS is_forced_plan,
+    MAX(plan_forcing_type) AS plan_forcing_type,
+    MAX(query_plan_text) AS query_plan_text,
+    MAX(execution_type_desc) AS execution_type_desc,
+    MIN(first_execution_time) AS first_execution_time,
+    AVG(CAST(avg_clr_time_us AS DOUBLE)) / 1000.0 AS avg_clr_time_ms,
+    AVG(CAST(avg_tempdb_space_used AS DOUBLE)) AS avg_tempdb_space_used,
+    AVG(CAST(avg_log_bytes_used AS DOUBLE)) AS avg_log_bytes_used,
+    MAX(plan_type) AS plan_type,
+    MAX(force_failure_count) AS force_failure_count,
+    MAX(last_force_failure_reason) AS last_force_failure_reason,
+    MAX(compatibility_level) AS compatibility_level
 FROM v_query_store_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
 AND   query_text NOT LIKE 'WAITFOR%'
 GROUP BY database_name, query_id, plan_id, query_hash
-ORDER BY SUM(execution_count) * AVG(avg_duration_ms) DESC
+ORDER BY SUM(execution_count) * AVG(CAST(avg_duration_us AS DOUBLE)) DESC
 LIMIT $4";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
@@ -69,15 +84,30 @@ ORDER BY SUM(execution_count) * AVG(avg_duration_ms) DESC
                 PlanId = reader.IsDBNull(2) ? 0 : reader.GetInt64(2),
                 QueryHash = reader.IsDBNull(3) ? "" : reader.GetString(3),
                 QueryText = reader.IsDBNull(4) ? "" : reader.GetString(4),
-                TotalExecutions = reader.IsDBNull(5) ? 0 : reader.GetInt64(5),
-                AvgDurationMs = reader.IsDBNull(6) ? 0 : ToDouble(reader.GetValue(6)),
-                AvgCpuTimeMs = reader.IsDBNull(7) ? 0 : ToDouble(reader.GetValue(7)),
-                AvgLogicalReads = reader.IsDBNull(8) ? 0 : ToDouble(reader.GetValue(8)),
-                AvgLogicalWrites = reader.IsDBNull(9) ? 0 : ToDouble(reader.GetValue(9)),
-                AvgPhysicalReads = reader.IsDBNull(10) ? 0 : ToDouble(reader.GetValue(10)),
-                AvgRowcount = reader.IsDBNull(11) ? 0 : ToDouble(reader.GetValue(11)),
-                LastExecutionTime = reader.IsDBNull(12) ? (DateTime?)null : reader.GetDateTime(12),
-                QueryPlanHash = reader.IsDBNull(13) ? "" : reader.GetString(13)
+                ModuleName = reader.IsDBNull(5) ? "" : reader.GetString(5),
+                TotalExecutions = reader.IsDBNull(6) ? 0 : reader.GetInt64(6),
+                AvgDurationMs = reader.IsDBNull(7) ? 0 : ToDouble(reader.GetValue(7)),
+                AvgCpuTimeMs = reader.IsDBNull(8) ? 0 : ToDouble(reader.GetValue(8)),
+                AvgLogicalReads = reader.IsDBNull(9) ? 0 : ToDouble(reader.GetValue(9)),
+                AvgLogicalWrites = reader.IsDBNull(10) ? 0 : ToDouble(reader.GetValue(10)),
+                AvgPhysicalReads = reader.IsDBNull(11) ? 0 : ToDouble(reader.GetValue(11)),
+                AvgRowcount = reader.IsDBNull(12) ? 0 : ToDouble(reader.GetValue(12)),
+                MinDop = reader.IsDBNull(13) ? 0 : Convert.ToInt64(reader.GetValue(13)),
+                MaxDop = reader.IsDBNull(14) ? 0 : Convert.ToInt64(reader.GetValue(14)),
+                LastExecutionTime = reader.IsDBNull(15) ? (DateTime?)null : reader.GetDateTime(15),
+                QueryPlanHash = reader.IsDBNull(16) ? "" : reader.GetString(16),
+                IsForcedPlan = !reader.IsDBNull(17) && reader.GetBoolean(17),
+                PlanForcingType = reader.IsDBNull(18) ? "" : reader.GetString(18),
+                QueryPlanText = reader.IsDBNull(19) ? null : reader.GetString(19),
+                ExecutionTypeDesc = reader.IsDBNull(20) ? "" : reader.GetString(20),
+                FirstExecutionTime = reader.IsDBNull(21) ? (DateTime?)null : reader.GetDateTime(21),
+                AvgClrTimeMs = reader.IsDBNull(22) ? 0 : ToDouble(reader.GetValue(22)),
+                AvgTempdbSpaceUsed = reader.IsDBNull(23) ? 0 : ToDouble(reader.GetValue(23)),
+                AvgLogBytesUsed = reader.IsDBNull(24) ? 0 : ToDouble(reader.GetValue(24)),
+                PlanType = reader.IsDBNull(25) ? "" : reader.GetString(25),
+                ForceFailureCount = reader.IsDBNull(26) ? 0 : Convert.ToInt64(reader.GetValue(26)),
+                LastForceFailureReason = reader.IsDBNull(27) ? "" : reader.GetString(27),
+                CompatibilityLevel = reader.IsDBNull(28) ? 0 : Convert.ToInt32(reader.GetValue(28))
             });
         }
 
@@ -95,13 +125,15 @@ public async Task<List<QueryStoreHistoryRow>> GetQueryStoreHistoryAsync(int serv
 SELECT
     collection_time,
     execution_count,
-    avg_duration_ms,
-    avg_cpu_time_ms,
-    avg_logical_reads,
-    avg_logical_writes,
-    avg_physical_reads,
-    avg_rowcount,
-    last_execution_time
+    avg_duration_us / 1000.0 AS avg_duration_ms,
+    avg_cpu_time_us / 1000.0 AS avg_cpu_time_ms,
+    CAST(avg_logical_io_reads AS DOUBLE) AS avg_logical_reads,
+    CAST(avg_logical_io_writes AS DOUBLE) AS avg_logical_writes,
+    CAST(avg_physical_io_reads AS DOUBLE) AS avg_physical_reads,
+    CAST(avg_rowcount AS DOUBLE) AS avg_rowcount,
+    last_execution_time,
+    min_dop,
+    max_dop
 FROM v_query_store_stats
 WHERE server_id = $1
 AND   database_name = $2
@@ -130,7 +162,9 @@ FROM v_query_store_stats
                 AvgLogicalWrites = reader.IsDBNull(5) ? 0 : ToDouble(reader.GetValue(5)),
                 AvgPhysicalReads = reader.IsDBNull(6) ? 0 : ToDouble(reader.GetValue(6)),
                 AvgRowcount = reader.IsDBNull(7) ? 0 : ToDouble(reader.GetValue(7)),
-                LastExecutionTime = reader.IsDBNull(8) ? (DateTime?)null : reader.GetDateTime(8)
+                LastExecutionTime = reader.IsDBNull(8) ? (DateTime?)null : reader.GetDateTime(8),
+                MinDop = reader.IsDBNull(9) ? 0 : Convert.ToInt64(reader.GetValue(9)),
+                MaxDop = reader.IsDBNull(10) ? 0 : Convert.ToInt64(reader.GetValue(10))
             });
         }
 
@@ -204,7 +238,7 @@ AND   qsp.query_plan IS NOT NULL
         return result as string;
     }
     /// <summary>
-    /// Gets Query Store duration trend — SUM(execution_count * avg_duration_ms) per collection snapshot.
+    /// Gets Query Store duration trend — SUM(execution_count * avg_duration) per collection snapshot.
     /// </summary>
     public async Task<List<QueryTrendPoint>> GetQueryStoreDurationTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
     {
@@ -218,7 +252,7 @@ WITH raw AS
 (
     SELECT
         collection_time,
-        SUM(execution_count * avg_duration_ms) AS total_duration_ms,
+        SUM(execution_count * avg_duration_us / 1000.0) AS total_duration_ms,
         SUM(execution_count) AS total_executions,
         date_diff('second', LAG(collection_time) OVER (ORDER BY collection_time), collection_time) AS interval_seconds
     FROM v_query_store_stats
@@ -260,6 +294,7 @@ public class QueryStoreRow
     public long PlanId { get; set; }
     public string QueryHash { get; set; } = "";
     public string QueryText { get; set; } = "";
+    public string ModuleName { get; set; } = "";
     public long TotalExecutions { get; set; }
     public double AvgDurationMs { get; set; }
     public double AvgCpuTimeMs { get; set; }
@@ -267,8 +302,24 @@ public class QueryStoreRow
     public double AvgLogicalWrites { get; set; }
     public double AvgPhysicalReads { get; set; }
     public double AvgRowcount { get; set; }
+    public long MinDop { get; set; }
+    public long MaxDop { get; set; }
     public DateTime? LastExecutionTime { get; set; }
     public string QueryPlanHash { get; set; } = "";
+    public bool IsForcedPlan { get; set; }
+    public string PlanForcingType { get; set; } = "";
+    public string? QueryPlanText { get; set; }
+    public string ExecutionTypeDesc { get; set; } = "";
+    public DateTime? FirstExecutionTime { get; set; }
+    public double AvgClrTimeMs { get; set; }
+    public double AvgTempdbSpaceUsed { get; set; }
+    public double AvgLogBytesUsed { get; set; }
+    public string PlanType { get; set; } = "";
+    public long ForceFailureCount { get; set; }
+    public string LastForceFailureReason { get; set; } = "";
+    public int CompatibilityLevel { get; set; }
+    public bool HasQueryPlan => !string.IsNullOrEmpty(QueryPlanText);
+    public string FirstExecutionTimeLocal => ServerTimeHelper.FormatServerTime(FirstExecutionTime);
     public string LastExecutionTimeLocal => ServerTimeHelper.FormatServerTime(LastExecutionTime);
     public double TotalCpuMs => TotalExecutions * AvgCpuTimeMs;
     public double TotalDurationMs => TotalExecutions * AvgDurationMs;
@@ -285,6 +336,8 @@ public class QueryStoreHistoryRow
     public double AvgPhysicalReads { get; set; }
     public double AvgRowcount { get; set; }
     public DateTime? LastExecutionTime { get; set; }
+    public long MinDop { get; set; }
+    public long MaxDop { get; set; }
     public double TotalDurationMs => ExecutionCount * AvgDurationMs;
     public double TotalCpuMs => ExecutionCount * AvgCpuTimeMs;
     public string CollectionTimeLocal => ServerTimeHelper.FormatServerTime(CollectionTime);
diff --git a/Lite/Services/LocalDataService.WaitingTasks.cs b/Lite/Services/LocalDataService.WaitingTasks.cs
index e9ca02ad..0f0a3202 100644
--- a/Lite/Services/LocalDataService.WaitingTasks.cs
+++ b/Lite/Services/LocalDataService.WaitingTasks.cs
@@ -57,6 +57,97 @@ FROM waiting_tasks
 
         return items;
     }
+
+    /// <summary>
+    /// Gets waiting task duration trend grouped by wait type for charting.
+    /// </summary>
+    public async Task<List<WaitingTaskTrendPoint>> GetWaitingTaskTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+SELECT
+    collection_time,
+    wait_type,
+    SUM(wait_duration_ms) AS total_wait_ms
+FROM waiting_tasks
+WHERE server_id = $1
+AND   collection_time >= $2
+AND   collection_time <= $3
+AND   wait_type IS NOT NULL
+GROUP BY
+    collection_time,
+    wait_type
+ORDER BY
+    collection_time,
+    wait_type";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<WaitingTaskTrendPoint>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new WaitingTaskTrendPoint
+            {
+                CollectionTime = reader.GetDateTime(0),
+                WaitType = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                TotalWaitMs = reader.IsDBNull(2) ? 0 : ToInt64(reader.GetValue(2))
+            });
+        }
+        return items;
+    }
+
+    /// <summary>
+    /// Gets blocked session count trend grouped by database for charting.
+    /// </summary>
+    public async Task<List<BlockedSessionTrendPoint>> GetBlockedSessionTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+SELECT
+    collection_time,
+    database_name,
+    COUNT(*) AS blocked_count
+FROM waiting_tasks
+WHERE server_id = $1
+AND   blocking_session_id > 0
+AND   collection_time >= $2
+AND   collection_time <= $3
+AND   database_name IS NOT NULL
+GROUP BY
+    collection_time,
+    database_name
+ORDER BY
+    collection_time,
+    database_name";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<BlockedSessionTrendPoint>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new BlockedSessionTrendPoint
+            {
+                CollectionTime = reader.GetDateTime(0),
+                DatabaseName = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                BlockedCount = reader.IsDBNull(2) ? 0 : Convert.ToInt32(reader.GetValue(2))
+            });
+        }
+        return items;
+    }
 }
 
 public class WaitingTaskRow
@@ -75,3 +166,17 @@ public class WaitingTaskRow
             ? $"{WaitDurationMs / 1000.0:F1} s"
             : $"{WaitDurationMs / 60000.0:F1} min";
 }
+
+public class WaitingTaskTrendPoint
+{
+    public DateTime CollectionTime { get; set; }
+    public string WaitType { get; set; } = "";
+    public long TotalWaitMs { get; set; }
+}
+
+public class BlockedSessionTrendPoint
+{
+    public DateTime CollectionTime { get; set; }
+    public string DatabaseName { get; set; } = "";
+    public int BlockedCount { get; set; }
+}
diff --git a/Lite/Services/LocalDataService.cs b/Lite/Services/LocalDataService.cs
index 6e407acc..ca65309b 100644
--- a/Lite/Services/LocalDataService.cs
+++ b/Lite/Services/LocalDataService.cs
@@ -32,13 +32,24 @@ public LocalDataService(DuckDbInitializer duckDb)
     }
 
     /// <summary>
-    /// Creates and opens a DuckDB connection.
+    /// Creates and opens a DuckDB connection wrapped in a read lock.
+    /// The lock prevents CHECKPOINT and compaction from reorganizing the database file
+    /// while this connection is reading from it.
     /// </summary>
-    internal async Task<DuckDBConnection> OpenConnectionAsync()
+    internal async Task<LockedConnection> OpenConnectionAsync()
     {
-        var connection = _duckDb.CreateConnection();
-        await connection.OpenAsync();
-        return connection;
+        var readLock = _duckDb.AcquireReadLock();
+        try
+        {
+            var connection = _duckDb.CreateConnection();
+            await connection.OpenAsync();
+            return new LockedConnection(connection, readLock);
+        }
+        catch
+        {
+            readLock.Dispose();
+            throw;
+        }
     }
 
     /// <summary>
diff --git a/Lite/Services/PlanAnalyzer.cs b/Lite/Services/PlanAnalyzer.cs
new file mode 100644
index 00000000..603cc83a
--- /dev/null
+++ b/Lite/Services/PlanAnalyzer.cs
@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using PerformanceMonitorLite.Models;
+
+namespace PerformanceMonitorLite.Services;
+
+/// <summary>
+/// Post-parse analysis pass that walks a parsed plan tree and adds warnings
+/// for common performance anti-patterns. Called after ShowPlanParser.Parse().
+/// </summary>
+public static class PlanAnalyzer
+{
+    public static void Analyze(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var stmt in batch.Statements)
+            {
+                AnalyzeStatement(stmt);
+
+                if (stmt.RootNode != null)
+                    AnalyzeNodeTree(stmt.RootNode);
+            }
+        }
+    }
+
+    private static void AnalyzeStatement(PlanStatement stmt)
+    {
+        // Rule 3: Serial plan with reason
+        if (!string.IsNullOrEmpty(stmt.NonParallelPlanReason))
+        {
+            var reason = stmt.NonParallelPlanReason switch
+            {
+                "MaxDOPSetToOne" => "MAXDOP is set to 1",
+                "EstimatedDOPIsOne" => "Estimated DOP is 1",
+                "NoParallelPlansInDesktopOrExpressEdition" => "Express/Desktop edition does not support parallelism",
+                "CouldNotGenerateValidParallelPlan" => "Optimizer could not generate a valid parallel plan",
+                "QueryHintNoParallelSet" => "OPTION (MAXDOP 1) hint forces serial execution",
+                _ => stmt.NonParallelPlanReason
+            };
+
+            stmt.PlanWarnings.Add(new PlanWarning
+            {
+                WarningType = "Serial Plan",
+                Message = $"Query forced to run serially: {reason}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 9: Memory grant issues (statement-level)
+        if (stmt.MemoryGrant != null)
+        {
+            var grant = stmt.MemoryGrant;
+
+            // Excessive grant — granted far more than actually used
+            if (grant.GrantedMemoryKB > 0 && grant.MaxUsedMemoryKB > 0)
+            {
+                var wasteRatio = (double)grant.GrantedMemoryKB / grant.MaxUsedMemoryKB;
+                if (wasteRatio >= 10 && grant.GrantedMemoryKB > 1024)
+                {
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Excessive Memory Grant",
+                        Message = $"Granted {grant.GrantedMemoryKB:N0} KB but only used {grant.MaxUsedMemoryKB:N0} KB ({wasteRatio:F0}x overestimate). Wasted memory blocks other queries.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+
+            // Grant wait — query had to wait for memory
+            if (grant.GrantWaitTimeMs > 0)
+            {
+                stmt.PlanWarnings.Add(new PlanWarning
+                {
+                    WarningType = "Memory Grant Wait",
+                    Message = $"Query waited {grant.GrantWaitTimeMs:N0}ms for a memory grant. Server may be under memory pressure.",
+                    Severity = grant.GrantWaitTimeMs >= 5000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+    }
+
+    private static void AnalyzeNodeTree(PlanNode node)
+    {
+        AnalyzeNode(node);
+
+        foreach (var child in node.Children)
+            AnalyzeNodeTree(child);
+    }
+
+    private static void AnalyzeNode(PlanNode node)
+    {
+        // Rule 1: Filter operators — rows survived the tree just to be discarded
+        if (node.PhysicalOp == "Filter" && !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Filter Operator",
+                Message = $"Filter discards rows late in the plan. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 2: Eager Index Spools — optimizer building temporary indexes on the fly
+        if (node.LogicalOp == "Eager Spool" &&
+            node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase))
+        {
+            var message = "Optimizer is building a temporary index at runtime. A permanent index may help.";
+            if (!string.IsNullOrEmpty(node.SuggestedIndex))
+                message += $"\n\nSuggested index:\n{node.SuggestedIndex}";
+
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Eager Index Spool",
+                Message = message,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 4: UDF timing — any node spending time in UDFs (actual plans)
+        if (node.UdfCpuTimeUs > 0 || node.UdfElapsedTimeUs > 0)
+        {
+            var cpuMs = node.UdfCpuTimeUs / 1000.0;
+            var elapsedMs = node.UdfElapsedTimeUs / 1000.0;
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "UDF Execution",
+                Message = $"Scalar UDF executing on this operator. UDF elapsed: {elapsedMs:F1}ms, UDF CPU: {cpuMs:F1}ms",
+                Severity = elapsedMs >= 1000 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 5: Large estimate vs actual row gaps (actual plans only)
+        if (node.HasActualStats && node.EstimateRows > 0)
+        {
+            var ratio = node.ActualRows / node.EstimateRows;
+            if (ratio >= 10.0 || ratio <= 0.1)
+            {
+                var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
+                var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
+                node.Warnings.Add(new PlanWarning
+                {
+                    WarningType = "Row Estimate Mismatch",
+                    Message = $"Estimated {node.EstimateRows:N0} rows, actual {node.ActualRows:N0} ({factor:F0}x {direction}). May cause poor plan choices.",
+                    Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
+                });
+            }
+        }
+
+        // Rule 6: Scalar UDF references (works on estimated plans too)
+        foreach (var udf in node.ScalarUdfs)
+        {
+            var type = udf.IsClrFunction ? "CLR" : "T-SQL";
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Scalar UDF",
+                Message = $"Scalar {type} UDF reference: {udf.FunctionName}. Scalar UDFs execute row-by-row and prevent parallelism.",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 7: Spill detection — promote severity for large spills
+        foreach (var w in node.Warnings.ToList())
+        {
+            if (w.SpillDetails != null && w.SpillDetails.WritesToTempDb > 1000)
+                w.Severity = PlanWarningSeverity.Critical;
+        }
+
+        // Rule 8: Parallel thread skew (actual plans with per-thread stats)
+        if (node.PerThreadStats.Count > 1)
+        {
+            var totalRows = node.PerThreadStats.Sum(t => t.ActualRows);
+            if (totalRows > 0)
+            {
+                var maxThread = node.PerThreadStats.OrderByDescending(t => t.ActualRows).First();
+                var skewRatio = (double)maxThread.ActualRows / totalRows;
+                if (skewRatio >= 0.9 && node.PerThreadStats.Count >= 4)
+                {
+                    node.Warnings.Add(new PlanWarning
+                    {
+                        WarningType = "Parallel Skew",
+                        Message = $"Thread {maxThread.ThreadId} processed {skewRatio:P0} of rows ({maxThread.ActualRows:N0}/{totalRows:N0}). Work is heavily skewed to one thread.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
+        // Rule 10: Key Lookup with residual predicate
+        if (node.Lookup && !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Key Lookup",
+                Message = $"Key Lookup with residual predicate. A covering index may eliminate this lookup. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Rule 11: Scan with residual predicate (not spools)
+        if (node.PhysicalOp.Contains("Scan", StringComparison.OrdinalIgnoreCase) &&
+            !node.PhysicalOp.Contains("Spool", StringComparison.OrdinalIgnoreCase) &&
+            !string.IsNullOrEmpty(node.Predicate))
+        {
+            node.Warnings.Add(new PlanWarning
+            {
+                WarningType = "Scan With Predicate",
+                Message = $"Scan filtering rows with a residual predicate. An index on the predicate columns may help. Predicate: {Truncate(node.Predicate, 200)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+    }
+
+    private static string Truncate(string value, int maxLength)
+    {
+        return value.Length <= maxLength ? value : value[..maxLength] + "...";
+    }
+}
diff --git a/Lite/Services/PlanIconMapper.cs b/Lite/Services/PlanIconMapper.cs
new file mode 100644
index 00000000..7c542857
--- /dev/null
+++ b/Lite/Services/PlanIconMapper.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Media.Imaging;
+
+namespace PerformanceMonitorLite.Services;
+
+public static class PlanIconMapper
+{
+    private static readonly Dictionary<string, BitmapImage> _iconCache = new();
+
+    // PhysicalOp (with spaces) → icon filename (without .png)
+    private static readonly Dictionary<string, string> IconMap = new(StringComparer.OrdinalIgnoreCase)
+    {
+        // Join operators
+        ["Adaptive Join"] = "adaptive_join",
+        ["Hash Match"] = "hash_match",
+        ["Merge Join"] = "merge_join",
+        ["Nested Loops"] = "nested_loops",
+
+        // Index operations
+        ["Clustered Index Delete"] = "clustered_index_delete",
+        ["Clustered Index Insert"] = "clustered_index_insert",
+        ["Clustered Index Merge"] = "clustered_index_merge",
+        ["Clustered Index Scan"] = "clustered_index_scan",
+        ["Clustered Index Seek"] = "clustered_index_seek",
+        ["Clustered Index Update"] = "clustered_index_update",
+        ["Clustered Update"] = "clustered_update",
+        ["Index Delete"] = "index_delete",
+        ["Index Insert"] = "index_insert",
+        ["Index Scan"] = "index_scan",
+        ["Index Seek"] = "index_seek",
+        ["Index Spool"] = "index_spool",
+        ["Index Update"] = "index_update",
+
+        // Columnstore
+        ["Columnstore Index Delete"] = "columnstore_index_delete",
+        ["Columnstore Index Insert"] = "columnstore_index_insert",
+        ["Columnstore Index Merge"] = "columnstore_index_merge",
+        ["Columnstore Index Scan"] = "columnstore_index_scan",
+        ["Columnstore Index Update"] = "columnstore_index_update",
+
+        // Scan operators
+        ["Table Scan"] = "table_scan",
+        ["Constant Scan"] = "constant_scan",
+        ["Deleted Scan"] = "deleted_scan",
+        ["Inserted Scan"] = "inserted_scan",
+        ["Log Row Scan"] = "log_row_scan",
+        ["Parameter Table Scan"] = "parameter_table_scan",
+
+        // Table DML
+        ["Table Delete"] = "table_delete",
+        ["Table Insert"] = "table_insert",
+        ["Table Merge"] = "table_merge",
+        ["Table Update"] = "table_update",
+
+        // Lookup
+        ["Key Lookup"] = "bookmark_lookup",
+        ["RID Lookup"] = "rid_lookup",
+        ["Bookmark Lookup"] = "bookmark_lookup",
+
+        // Aggregation
+        ["Stream Aggregate"] = "stream_aggregate",
+        ["Window Aggregate"] = "window_aggregate",
+        ["Group By Aggregate"] = "group_by_aggregate",
+
+        // Scalar / compute
+        ["Compute Scalar"] = "compute_scalar",
+        ["Filter"] = "filter",
+        ["Assert"] = "assert",
+
+        // Sort / top
+        ["Sort"] = "sort",
+        ["Top"] = "top",
+
+        // Spool
+        ["Table Spool"] = "table_spool",
+        ["Row Count Spool"] = "row_count_spool",
+        ["Window Spool"] = "table_spool",
+        ["Eager Spool"] = "table_spool",
+        ["Lazy Spool"] = "table_spool",
+        ["Spool"] = "spool",
+
+        // Set operations
+        ["Concatenation"] = "concatenation",
+        ["Union"] = "union",
+        ["Union All"] = "union_all",
+
+        // Parallelism
+        ["Parallelism"] = "parallelism",
+        ["Distribute Streams"] = "parallelism",
+        ["Gather Streams"] = "parallelism",
+        ["Repartition Streams"] = "parallelism",
+
+        // Remote
+        ["Remote Query"] = "remote_query",
+        ["Remote Scan"] = "remote_scan",
+        ["Remote Index Scan"] = "remote_index_scan",
+        ["Remote Index Seek"] = "remote_index_seek",
+        ["Remote Insert"] = "remote_insert",
+        ["Remote Delete"] = "remote_delete",
+        ["Remote Update"] = "remote_update",
+
+        // Miscellaneous
+        ["Bitmap"] = "bitmap",
+        ["Batch Hash Table Build"] = "batch_hash_table_build",
+        ["Collapse"] = "collapse",
+        ["Distinct"] = "sort",
+        ["Foreign Key References Check"] = "foreign_key_references_check",
+        ["Merge Interval"] = "merge_interval",
+        ["Print"] = "print",
+        ["Rank"] = "rank",
+        ["Segment"] = "segment",
+        ["Sequence"] = "sequence",
+        ["Sequence Project"] = "sequence_project",
+        ["Split"] = "split",
+        ["Switch"] = "switch",
+        ["Table-valued function"] = "table_valued_function",
+        ["UDX"] = "udx",
+        ["Predict"] = "predict",
+        ["Apply"] = "apply",
+
+        // PDW / distributed
+        ["Broadcast"] = "broadcast",
+        ["Compute To Control Node"] = "compute_to_control_node",
+        ["Const Table Get"] = "const_table_get",
+        ["Control To Compute Nodes"] = "control_to_compute_nodes",
+        ["External Broadcast"] = "external_broadcast",
+        ["External Export"] = "external_export",
+        ["External Local Streaming"] = "external_local_streaming",
+        ["External Round Robin"] = "external_round_robin",
+        ["External Shuffle"] = "external_shuffle",
+        ["Get"] = "get",
+        ["Group By Apply"] = "apply",
+        ["Join"] = "join",
+        ["Project"] = "project",
+        ["Shuffle"] = "shuffle",
+        ["Single Source Round Robin"] = "single_source_round_robin",
+        ["Single Source Shuffle"] = "single_source_shuffle",
+        ["Trim"] = "trim",
+
+        // Cursor operators
+        ["Fetch Query"] = "fetch_query",
+        ["Population Query"] = "population_query",
+        ["Refresh Query"] = "refresh_query",
+
+        // Legacy / Shiloh
+        ["Result"] = "result",
+        ["Aggregate"] = "aggregate",
+        ["Assign"] = "assign",
+        ["Arithmetic Expression"] = "arithmetic_expression",
+        ["Convert"] = "convert",
+        ["Declare"] = "declare",
+        ["Delete"] = "delete",
+        ["Dynamic"] = "dynamic",
+        ["Hash Match Root"] = "hash_match_root",
+        ["Hash Match Team"] = "hash_match_team",
+        ["If"] = "if",
+        ["Insert"] = "insert",
+        ["Intrinsic"] = "intrinsic",
+        ["Keyset"] = "keyset",
+        ["Locate"] = "locate",
+        ["Set Function"] = "set_function",
+        ["Snapshot"] = "snapshot",
+        ["TSQL"] = "sql",
+        ["Update"] = "update",
+
+        // Catch-all
+        ["Cursor Catch All"] = "cursor_catch_all",
+        ["Language Construct Catch All"] = "language_construct_catch_all",
+    };
+
+    public static string GetIconName(string physicalOp)
+    {
+        if (IconMap.TryGetValue(physicalOp, out var iconName))
+            return iconName;
+
+        // Try removing spaces as fallback
+        var normalized = physicalOp.Replace(" ", "_").ToLowerInvariant();
+        return normalized;
+    }
+
+    public static BitmapImage? GetIcon(string iconName)
+    {
+        if (_iconCache.TryGetValue(iconName, out var cached))
+            return cached;
+
+        try
+        {
+            var uri = new Uri($"pack://application:,,,/Resources/PlanIcons/{iconName}.png", UriKind.Absolute);
+            var bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.UriSource = uri;
+            bitmap.CacheOption = BitmapCacheOption.OnLoad;
+            bitmap.DecodePixelWidth = 32;
+            bitmap.EndInit();
+            bitmap.Freeze();
+            _iconCache[iconName] = bitmap;
+            return bitmap;
+        }
+        catch
+        {
+            // Try fallback icon
+            if (iconName != "iterator_catch_all")
+                return GetIcon("iterator_catch_all");
+            return null;
+        }
+    }
+}
diff --git a/Lite/Services/PlanLayoutEngine.cs b/Lite/Services/PlanLayoutEngine.cs
new file mode 100644
index 00000000..daeb0ee7
--- /dev/null
+++ b/Lite/Services/PlanLayoutEngine.cs
@@ -0,0 +1,102 @@
+using System;
+using PerformanceMonitorLite.Models;
+
+namespace PerformanceMonitorLite.Services;
+
+public static class PlanLayoutEngine
+{
+    public const double NodeWidth = 150;
+    public const double HorizontalSpacing = 180;
+    public const double VerticalSpacing = 24;
+    public const double Padding = 40;
+
+    /* Per-line heights matching CreateNodeVisual font sizes + WPF line spacing */
+    private const double IconRowHeight = 36;  /* 32px icon + 2px margin + 2px spacing */
+    private const double Line10 = 17;         /* FontSize 10 text block */
+    private const double Line9 = 15;          /* FontSize 9 text block */
+    private const double NodePadding = 12;    /* Border padding (4+4) + border thickness */
+
+    /// <summary>
+    /// Minimum node height (estimated plans without actual stats or object name).
+    /// </summary>
+    public const double NodeHeightMin = 90;
+
+    public static void Layout(PlanStatement statement)
+    {
+        if (statement.RootNode == null) return;
+
+        // Phase 1: X positions by tree depth (root at left, children to the right)
+        SetXPositions(statement.RootNode, 0);
+
+        // Phase 2: Y positions with overlap prevention
+        double nextY = Padding;
+        SetYPositions(statement.RootNode, ref nextY);
+    }
+
+    public static (double width, double height) GetExtents(PlanNode root)
+    {
+        double maxX = 0, maxBottom = 0;
+        CollectExtents(root, ref maxX, ref maxBottom);
+        return (maxX + NodeWidth + Padding, maxBottom + Padding);
+    }
+
+    /// <summary>
+    /// Calculates the expected rendered height of a node based on its content.
+    /// Matches the lines emitted by CreateNodeVisual in PlanViewerControl.
+    /// </summary>
+    public static double GetNodeHeight(PlanNode node)
+    {
+        double h = IconRowHeight + Line10 + Line10 + NodePadding; /* icon + name + cost + padding */
+
+        if (node.HasActualStats)
+        {
+            h += Line10;  /* elapsed time */
+            h += Line9;   /* CPU time */
+            h += Line9;   /* actual/estimated rows */
+        }
+
+        if (!string.IsNullOrEmpty(node.ObjectName))
+        {
+            h += Line9;   /* object name */
+        }
+
+        return Math.Max(h, NodeHeightMin);
+    }
+
+    private static void SetXPositions(PlanNode node, int depth)
+    {
+        node.X = Padding + depth * HorizontalSpacing;
+
+        foreach (var child in node.Children)
+            SetXPositions(child, depth + 1);
+    }
+
+    private static void SetYPositions(PlanNode node, ref double nextY)
+    {
+        if (node.Children.Count == 0)
+        {
+            // Leaf node: place at the next available Y position
+            node.Y = nextY;
+            nextY += GetNodeHeight(node) + VerticalSpacing;
+            return;
+        }
+
+        // Process children first (post-order)
+        foreach (var child in node.Children)
+            SetYPositions(child, ref nextY);
+
+        // SSMS-style: parent aligns with first child (creates horizontal spine)
+        node.Y = node.Children[0].Y;
+    }
+
+    private static void CollectExtents(PlanNode node, ref double maxX, ref double maxBottom)
+    {
+        if (node.X > maxX) maxX = node.X;
+
+        var bottom = node.Y + GetNodeHeight(node);
+        if (bottom > maxBottom) maxBottom = bottom;
+
+        foreach (var child in node.Children)
+            CollectExtents(child, ref maxX, ref maxBottom);
+    }
+}
diff --git a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
index f81df834..b47a9284 100644
--- a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
+++ b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
@@ -119,7 +119,7 @@ EXECUTE sys.sp_configure
         using (var cmd = new SqlCommand(@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     is_running = CASE WHEN dxs.name IS NOT NULL THEN 1 ELSE 0 END
 FROM sys.server_event_sessions AS ses
 LEFT JOIN sys.dm_xe_sessions AS dxs
@@ -200,7 +200,7 @@ private async Task EnsureBlockedProcessXeSessionAzureSqlDbAsync(SqlConnection co
         using (var cmd = new SqlCommand(@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     session_state = des.name
 FROM sys.database_event_sessions AS des
 WHERE des.name = @session_name;", connection))
@@ -285,7 +285,7 @@ ring_buffer xml NOT NULL
 (
     ring_buffer
 )
-SELECT
+SELECT /* PerformanceMonitorLite */
     ring_xml = TRY_CAST(xet.target_data AS xml)
 FROM sys.dm_xe_database_session_targets AS xet
 JOIN sys.dm_xe_database_sessions AS xes
@@ -325,7 +325,7 @@ ring_buffer xml NOT NULL
 (
     ring_buffer
 )
-SELECT
+SELECT /* PerformanceMonitorLite */
     ring_xml = TRY_CAST(xet.target_data AS xml)
 FROM sys.dm_xe_session_targets AS xet
 JOIN sys.dm_xe_sessions AS xes
diff --git a/Lite/Services/RemoteCollectorService.Deadlocks.cs b/Lite/Services/RemoteCollectorService.Deadlocks.cs
index 5fc79330..883341b7 100644
--- a/Lite/Services/RemoteCollectorService.Deadlocks.cs
+++ b/Lite/Services/RemoteCollectorService.Deadlocks.cs
@@ -72,7 +72,7 @@ private async Task EnsureDeadlockXeSessionOnPremAsync(SqlConnection connection,
         using (var cmd = new SqlCommand(@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     is_running = CASE WHEN dxs.name IS NOT NULL THEN 1 ELSE 0 END
 FROM sys.server_event_sessions AS ses
 LEFT JOIN sys.dm_xe_sessions AS dxs
@@ -156,7 +156,7 @@ private async Task EnsureDeadlockXeSessionAzureSqlDbAsync(SqlConnection connecti
         using (var cmd = new SqlCommand(@"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     has_correct_event = CASE
         WHEN EXISTS
         (
@@ -282,7 +282,7 @@ ring_buffer xml NOT NULL
 (
     ring_buffer
 )
-SELECT
+SELECT /* PerformanceMonitorLite */
     ring_xml = TRY_CAST(xet.target_data AS xml)
 FROM sys.dm_xe_database_session_targets AS xet
 JOIN sys.dm_xe_database_sessions AS xes
@@ -323,7 +323,7 @@ ring_buffer xml NOT NULL
 (
     ring_buffer
 )
-SELECT
+SELECT /* PerformanceMonitorLite */
     ring_xml = TRY_CAST(xet.target_data AS xml)
 FROM sys.dm_xe_session_targets AS xet
 JOIN sys.dm_xe_sessions AS xes
diff --git a/Lite/Services/RemoteCollectorService.FileIo.cs b/Lite/Services/RemoteCollectorService.FileIo.cs
index 1681624a..f7438627 100644
--- a/Lite/Services/RemoteCollectorService.FileIo.cs
+++ b/Lite/Services/RemoteCollectorService.FileIo.cs
@@ -47,6 +47,8 @@ Azure MI (edition 8) HAS sys.master_files and behaves like on-prem. */
     write_bytes = vfs.num_of_bytes_written,
     io_stall_read_ms = vfs.io_stall_read_ms,
     io_stall_write_ms = vfs.io_stall_write_ms,
+    io_stall_queued_read_ms = vfs.io_stall_queued_read_ms,
+    io_stall_queued_write_ms = vfs.io_stall_queued_write_ms,
     database_id = vfs.database_id,
     file_id = vfs.file_id
 FROM sys.dm_io_virtual_file_stats(DB_ID(), NULL) AS vfs
@@ -68,6 +70,8 @@ LEFT JOIN sys.database_files AS df
     write_bytes = vfs.num_of_bytes_written,
     io_stall_read_ms = vfs.io_stall_read_ms,
     io_stall_write_ms = vfs.io_stall_write_ms,
+    io_stall_queued_read_ms = vfs.io_stall_queued_read_ms,
+    io_stall_queued_write_ms = vfs.io_stall_queued_write_ms,
     database_id = vfs.database_id,
     file_id = vfs.file_id
 FROM sys.dm_io_virtual_file_stats(NULL, NULL) AS vfs
@@ -96,7 +100,8 @@ AND   vfs.database_id < 32761
         var fileStats = new List<(
             string DatabaseName, string FileName, string FileType, string PhysicalName,
             decimal SizeMb, long NumOfReads, long NumOfWrites, long ReadBytes, long WriteBytes,
-            long IoStallReadMs, long IoStallWriteMs, int DatabaseId, int FileId)>();
+            long IoStallReadMs, long IoStallWriteMs, long IoStallQueuedReadMs, long IoStallQueuedWriteMs,
+            int DatabaseId, int FileId)>();
 
         while (await reader.ReadAsync(cancellationToken))
         {
@@ -112,8 +117,10 @@ AND   vfs.database_id < 32761
                 WriteBytes: reader.IsDBNull(8) ? 0L : reader.GetInt64(8),
                 IoStallReadMs: reader.IsDBNull(9) ? 0L : reader.GetInt64(9),
                 IoStallWriteMs: reader.IsDBNull(10) ? 0L : reader.GetInt64(10),
-                DatabaseId: reader.IsDBNull(11) ? 0 : Convert.ToInt32(reader.GetValue(11)),
-                FileId: reader.IsDBNull(12) ? 0 : Convert.ToInt32(reader.GetValue(12))
+                IoStallQueuedReadMs: reader.IsDBNull(11) ? 0L : reader.GetInt64(11),
+                IoStallQueuedWriteMs: reader.IsDBNull(12) ? 0L : reader.GetInt64(12),
+                DatabaseId: reader.IsDBNull(13) ? 0 : Convert.ToInt32(reader.GetValue(13)),
+                FileId: reader.IsDBNull(14) ? 0 : Convert.ToInt32(reader.GetValue(14))
             ));
         }
         sqlSw.Stop();
@@ -136,6 +143,8 @@ AND   vfs.database_id < 32761
                     var deltaWriteBytes = _deltaCalculator.CalculateDelta(serverId, "file_io_write_bytes", deltaKey, stat.WriteBytes);
                     var deltaStallReadMs = _deltaCalculator.CalculateDelta(serverId, "file_io_stall_read", deltaKey, stat.IoStallReadMs);
                     var deltaStallWriteMs = _deltaCalculator.CalculateDelta(serverId, "file_io_stall_write", deltaKey, stat.IoStallWriteMs);
+                    var deltaStallQueuedReadMs = _deltaCalculator.CalculateDelta(serverId, "file_io_stall_queued_read", deltaKey, stat.IoStallQueuedReadMs);
+                    var deltaStallQueuedWriteMs = _deltaCalculator.CalculateDelta(serverId, "file_io_stall_queued_write", deltaKey, stat.IoStallQueuedWriteMs);
 
                     var row = appender.CreateRow();
                     row.AppendValue(GenerateCollectionId())
@@ -153,12 +162,16 @@ AND   vfs.database_id < 32761
                        .AppendValue(stat.WriteBytes)
                        .AppendValue(stat.IoStallReadMs)
                        .AppendValue(stat.IoStallWriteMs)
+                       .AppendValue(stat.IoStallQueuedReadMs)
+                       .AppendValue(stat.IoStallQueuedWriteMs)
                        .AppendValue(deltaReads)
                        .AppendValue(deltaWrites)
                        .AppendValue(deltaReadBytes)
                        .AppendValue(deltaWriteBytes)
                        .AppendValue(deltaStallReadMs)
                        .AppendValue(deltaStallWriteMs)
+                       .AppendValue(deltaStallQueuedReadMs)
+                       .AppendValue(deltaStallQueuedWriteMs)
                        .EndRow();
 
                     rowsCollected++;
diff --git a/Lite/Services/RemoteCollectorService.MemoryGrants.cs b/Lite/Services/RemoteCollectorService.MemoryGrants.cs
index dfaeab5e..53b3438a 100644
--- a/Lite/Services/RemoteCollectorService.MemoryGrants.cs
+++ b/Lite/Services/RemoteCollectorService.MemoryGrants.cs
@@ -21,7 +21,8 @@ namespace PerformanceMonitorLite.Services;
 public partial class RemoteCollectorService
 {
     /// <summary>
-    /// Collects memory grant statistics from sys.dm_exec_query_memory_grants.
+    /// Collects memory grant statistics from sys.dm_exec_query_resource_semaphores.
+    /// Uses the same DMV as Dashboard for parity.
     /// </summary>
     private async Task<int> CollectMemoryGrantStatsAsync(ServerConnection server, CancellationToken cancellationToken)
     {
@@ -29,22 +30,20 @@ private async Task<int> CollectMemoryGrantStatsAsync(ServerConnection server, Ca
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
 SELECT
-    session_id = mg.session_id,
-    database_name = DB_NAME(st.dbid),
-    query_text = LEFT(st.text, 4000),
-    requested_memory_mb = CONVERT(decimal(18,2), mg.requested_memory_kb / 1024.0),
-    granted_memory_mb = CONVERT(decimal(18,2), ISNULL(mg.granted_memory_kb, 0) / 1024.0),
-    used_memory_mb = CONVERT(decimal(18,2), ISNULL(mg.used_memory_kb, 0) / 1024.0),
-    max_used_memory_mb = CONVERT(decimal(18,2), ISNULL(mg.max_used_memory_kb, 0) / 1024.0),
-    ideal_memory_mb = CONVERT(decimal(18,2), mg.ideal_memory_kb / 1024.0),
-    required_memory_mb = CONVERT(decimal(18,2), mg.required_memory_kb / 1024.0),
-    wait_time_ms = mg.wait_time_ms,
-    is_small_grant = mg.is_small,
-    dop = mg.dop,
-    query_cost = mg.query_cost
-FROM sys.dm_exec_query_memory_grants AS mg
-OUTER APPLY sys.dm_exec_sql_text(mg.sql_handle) AS st
-WHERE mg.session_id <> @@SPID
+    resource_semaphore_id = deqrs.resource_semaphore_id,
+    pool_id = deqrs.pool_id,
+    target_memory_mb = CONVERT(decimal(18,2), deqrs.target_memory_kb / 1024.0),
+    max_target_memory_mb = CONVERT(decimal(18,2), deqrs.max_target_memory_kb / 1024.0),
+    total_memory_mb = CONVERT(decimal(18,2), deqrs.total_memory_kb / 1024.0),
+    available_memory_mb = CONVERT(decimal(18,2), deqrs.available_memory_kb / 1024.0),
+    granted_memory_mb = CONVERT(decimal(18,2), ISNULL(deqrs.granted_memory_kb, 0) / 1024.0),
+    used_memory_mb = CONVERT(decimal(18,2), ISNULL(deqrs.used_memory_kb, 0) / 1024.0),
+    grantee_count = deqrs.grantee_count,
+    waiter_count = deqrs.waiter_count,
+    timeout_error_count = ISNULL(deqrs.timeout_error_count, 0),
+    forced_grant_count = ISNULL(deqrs.forced_grant_count, 0)
+FROM sys.dm_exec_query_resource_semaphores AS deqrs
+WHERE deqrs.max_target_memory_kb IS NOT NULL
 OPTION(RECOMPILE);";
 
         var serverId = GetServerId(server);
@@ -53,10 +52,10 @@ WHERE mg.session_id <> @@SPID
         _lastSqlMs = 0;
         _lastDuckDbMs = 0;
 
-        var rows = new List<(int SessionId, string? DatabaseName, string? QueryText,
-            decimal RequestedMb, decimal GrantedMb, decimal UsedMb, decimal MaxUsedMb,
-            decimal IdealMb, decimal RequiredMb, long WaitTimeMs, bool IsSmall,
-            int Dop, decimal QueryCost)>();
+        var rows = new List<(short ResourceSemaphoreId, int PoolId,
+            decimal TargetMb, decimal MaxTargetMb, decimal TotalMb, decimal AvailableMb,
+            decimal GrantedMb, decimal UsedMb,
+            int GranteeCount, int WaiterCount, long TimeoutErrorCount, long ForcedGrantCount)>();
 
         var sqlSw = Stopwatch.StartNew();
         using var sqlConnection = await CreateConnectionAsync(server, cancellationToken);
@@ -67,19 +66,18 @@ WHERE mg.session_id <> @@SPID
         while (await reader.ReadAsync(cancellationToken))
         {
             rows.Add((
-                Convert.ToInt32(reader.GetValue(0)),
-                reader.IsDBNull(1) ? null : reader.GetString(1),
-                reader.IsDBNull(2) ? null : reader.GetString(2),
+                Convert.ToInt16(reader.GetValue(0)),
+                Convert.ToInt32(reader.GetValue(1)),
+                reader.IsDBNull(2) ? 0m : reader.GetDecimal(2),
                 reader.IsDBNull(3) ? 0m : reader.GetDecimal(3),
                 reader.IsDBNull(4) ? 0m : reader.GetDecimal(4),
                 reader.IsDBNull(5) ? 0m : reader.GetDecimal(5),
                 reader.IsDBNull(6) ? 0m : reader.GetDecimal(6),
                 reader.IsDBNull(7) ? 0m : reader.GetDecimal(7),
-                reader.IsDBNull(8) ? 0m : reader.GetDecimal(8),
-                reader.IsDBNull(9) ? 0L : Convert.ToInt64(reader.GetValue(9)),
-                reader.IsDBNull(10) ? false : Convert.ToBoolean(reader.GetValue(10)),
-                reader.IsDBNull(11) ? 0 : Convert.ToInt32(reader.GetValue(11)),
-                reader.IsDBNull(12) ? 0m : SafeToDecimal(reader.GetValue(12))));
+                reader.IsDBNull(8) ? 0 : Convert.ToInt32(reader.GetValue(8)),
+                reader.IsDBNull(9) ? 0 : Convert.ToInt32(reader.GetValue(9)),
+                reader.IsDBNull(10) ? 0L : Convert.ToInt64(reader.GetValue(10)),
+                reader.IsDBNull(11) ? 0L : Convert.ToInt64(reader.GetValue(11))));
         }
         sqlSw.Stop();
 
@@ -93,24 +91,29 @@ WHERE mg.session_id <> @@SPID
             {
                 foreach (var r in rows)
                 {
+                    var deltaKey = $"{r.PoolId}_{r.ResourceSemaphoreId}";
+                    var deltaTimeouts = _deltaCalculator.CalculateDelta(serverId, "memory_grants_timeouts", deltaKey, r.TimeoutErrorCount);
+                    var deltaForced = _deltaCalculator.CalculateDelta(serverId, "memory_grants_forced", deltaKey, r.ForcedGrantCount);
+
                     var row = appender.CreateRow();
                     row.AppendValue(GenerateCollectionId())
                        .AppendValue(collectionTime)
                        .AppendValue(serverId)
                        .AppendValue(server.ServerName)
-                       .AppendValue(r.SessionId)
-                       .AppendValue(r.DatabaseName)
-                       .AppendValue(r.QueryText)
-                       .AppendValue(r.RequestedMb)
+                       .AppendValue(r.ResourceSemaphoreId)
+                       .AppendValue(r.PoolId)
+                       .AppendValue(r.TargetMb)
+                       .AppendValue(r.MaxTargetMb)
+                       .AppendValue(r.TotalMb)
+                       .AppendValue(r.AvailableMb)
                        .AppendValue(r.GrantedMb)
                        .AppendValue(r.UsedMb)
-                       .AppendValue(r.MaxUsedMb)
-                       .AppendValue(r.IdealMb)
-                       .AppendValue(r.RequiredMb)
-                       .AppendValue(r.WaitTimeMs)
-                       .AppendValue(r.IsSmall)
-                       .AppendValue(r.Dop)
-                       .AppendValue(r.QueryCost)
+                       .AppendValue(r.GranteeCount)
+                       .AppendValue(r.WaiterCount)
+                       .AppendValue(r.TimeoutErrorCount)
+                       .AppendValue(r.ForcedGrantCount)
+                       .AppendValue(deltaTimeouts)
+                       .AppendValue(deltaForced)
                        .EndRow();
                     rowsCollected++;
                 }
diff --git a/Lite/Services/RemoteCollectorService.Perfmon.cs b/Lite/Services/RemoteCollectorService.Perfmon.cs
index 867f878a..9c39a86f 100644
--- a/Lite/Services/RemoteCollectorService.Perfmon.cs
+++ b/Lite/Services/RemoteCollectorService.Perfmon.cs
@@ -34,6 +34,10 @@ public partial class RemoteCollectorService
         "Readahead pages/sec",
         "Background writer pages/sec",
         "Lazy writes/sec",
+        "Full Scans/sec",
+        "Index Searches/sec",
+        "Page Splits/sec",
+        "Free list stalls/sec",
         "Non-Page latch waits",
         "Page IO latch waits",
         "Page latch waits",
@@ -47,6 +51,8 @@ public partial class RemoteCollectorService
         "Lock Waits/sec",
         "Number of Deadlocks/sec",
         "Lock waits",
+        "Processes blocked",
+        "Lock Timeouts/sec",
         /* Memory counters */
         "Granted Workspace Memory (KB)",
         "Lock Memory (KB)",
@@ -75,6 +81,15 @@ public partial class RemoteCollectorService
         "Log Flush Write Time (ms)",
         "Log buffer waits",
         "Log write waits",
+        /* TempDB counters */
+        "Version Store Size (KB)",
+        "Free Space in tempdb (KB)",
+        "Active Temp Tables",
+        "Version Generation rate (KB/s)",
+        "Version Cleanup rate (KB/s)",
+        "Temp Tables Creation Rate",
+        "Workfiles Created/sec",
+        "Worktables Created/sec",
         /* Wait counters */
         "Network IO waits",
         "Wait for the worker"
diff --git a/Lite/Services/RemoteCollectorService.ProcedureStats.cs b/Lite/Services/RemoteCollectorService.ProcedureStats.cs
index acc6d653..a4503236 100644
--- a/Lite/Services/RemoteCollectorService.ProcedureStats.cs
+++ b/Lite/Services/RemoteCollectorService.ProcedureStats.cs
@@ -29,23 +29,26 @@ so the standard NOT IN filter excludes everything. Use a simplified query. */
         var serverStatus = _serverManager.GetConnectionStatus(server.Id);
         bool isAzureSqlDb = serverStatus.SqlEngineEdition == 5;
 
-        /* total_spills exists in dm_exec_procedure_stats and dm_exec_trigger_stats on all supported versions,
-           but does NOT exist in dm_exec_function_stats on any version. Use dynamic SQL to handle this. */
+        /* total_spills/min_spills/max_spills exist in dm_exec_procedure_stats and dm_exec_trigger_stats
+           on all supported versions, but do NOT exist in dm_exec_function_stats on any version.
+           Use dynamic SQL to handle this. */
         const string standardQuery = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
 DECLARE
-    @spills_col nvarchar(200) = N'total_spills = ISNULL(s.total_spills, 0),',
-    @fn_spills_col nvarchar(200) = N'total_spills = CONVERT(bigint, 0),',
+    @spills_cols nvarchar(400) = N'total_spills = ISNULL(s.total_spills, 0), min_spills = ISNULL(s.min_spills, 0), max_spills = ISNULL(s.max_spills, 0),',
+    @fn_spills_cols nvarchar(400) = N'total_spills = CONVERT(bigint, 0), min_spills = CONVERT(bigint, 0), max_spills = CONVERT(bigint, 0),',
     @sql nvarchar(max);
 
 SET @sql = CAST(N'
-SELECT TOP (150) * FROM (
+SELECT /* PerformanceMonitorLite */ TOP (150) * FROM (
 SELECT
     database_name = d.name,
     schema_name = OBJECT_SCHEMA_NAME(s.object_id, s.database_id),
     object_name = OBJECT_NAME(s.object_id, s.database_id),
     object_type = N''PROCEDURE'',
+    cached_time = s.cached_time,
+    last_execution_time = s.last_execution_time,
     execution_count = s.execution_count,
     total_worker_time = s.total_worker_time,
     total_elapsed_time = s.total_elapsed_time,
@@ -56,7 +59,13 @@ SELECT TOP (150) * FROM (
     max_worker_time = s.max_worker_time,
     min_elapsed_time = s.min_elapsed_time,
     max_elapsed_time = s.max_elapsed_time,
-    ' AS nvarchar(max)) + @spills_col + N'
+    min_logical_reads = s.min_logical_reads,
+    max_logical_reads = s.max_logical_reads,
+    min_physical_reads = s.min_physical_reads,
+    max_physical_reads = s.max_physical_reads,
+    min_logical_writes = s.min_logical_writes,
+    max_logical_writes = s.max_logical_writes,
+    ' AS nvarchar(max)) + @spills_cols + N'
     sql_handle = CONVERT(varchar(64), s.sql_handle, 1),
     plan_handle = CONVERT(varchar(64), s.plan_handle, 1)
 FROM sys.dm_exec_procedure_stats AS s
@@ -70,6 +79,7 @@ FROM sys.dm_exec_plan_attributes(s.plan_handle) AS pa
 LEFT JOIN sys.databases AS d
   ON pa.dbid = d.database_id
 WHERE pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
+AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 
 UNION ALL
 
@@ -90,6 +100,8 @@ THEN LTRIM(RTRIM(REPLACE(REPLACE(
         END
     ),
     object_type = N''TRIGGER'',
+    cached_time = s.cached_time,
+    last_execution_time = s.last_execution_time,
     execution_count = s.execution_count,
     total_worker_time = s.total_worker_time,
     total_elapsed_time = s.total_elapsed_time,
@@ -100,7 +112,13 @@ THEN LTRIM(RTRIM(REPLACE(REPLACE(
     max_worker_time = s.max_worker_time,
     min_elapsed_time = s.min_elapsed_time,
     max_elapsed_time = s.max_elapsed_time,
-    ' + @spills_col + CAST(N'
+    min_logical_reads = s.min_logical_reads,
+    max_logical_reads = s.max_logical_reads,
+    min_physical_reads = s.min_physical_reads,
+    max_physical_reads = s.max_physical_reads,
+    min_logical_writes = s.min_logical_writes,
+    max_logical_writes = s.max_logical_writes,
+    ' + @spills_cols + CAST(N'
     sql_handle = CONVERT(varchar(64), s.sql_handle, 1),
     plan_handle = CONVERT(varchar(64), s.plan_handle, 1)
 FROM sys.dm_exec_trigger_stats AS s
@@ -115,6 +133,7 @@ FROM sys.dm_exec_plan_attributes(s.plan_handle) AS pa
 LEFT JOIN sys.databases AS d
   ON pa.dbid = d.database_id
 WHERE pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
+AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 
 UNION ALL
 
@@ -123,6 +142,8 @@ UNION ALL
     schema_name = OBJECT_SCHEMA_NAME(s.object_id, s.database_id),
     object_name = OBJECT_NAME(s.object_id, s.database_id),
     object_type = N''FUNCTION'',
+    cached_time = s.cached_time,
+    last_execution_time = s.last_execution_time,
     execution_count = s.execution_count,
     total_worker_time = s.total_worker_time,
     total_elapsed_time = s.total_elapsed_time,
@@ -133,7 +154,13 @@ UNION ALL
     max_worker_time = s.max_worker_time,
     min_elapsed_time = s.min_elapsed_time,
     max_elapsed_time = s.max_elapsed_time,
-    ' AS nvarchar(max)) + @fn_spills_col + CAST(N'
+    min_logical_reads = s.min_logical_reads,
+    max_logical_reads = s.max_logical_reads,
+    min_physical_reads = s.min_physical_reads,
+    max_physical_reads = s.max_physical_reads,
+    min_logical_writes = s.min_logical_writes,
+    max_logical_writes = s.max_logical_writes,
+    ' AS nvarchar(max)) + @fn_spills_cols + CAST(N'
     sql_handle = CONVERT(varchar(64), s.sql_handle, 1),
     plan_handle = CONVERT(varchar(64), s.plan_handle, 1)
 FROM sys.dm_exec_function_stats AS s
@@ -147,6 +174,7 @@ FROM sys.dm_exec_plan_attributes(s.plan_handle) AS pa
 LEFT JOIN sys.databases AS d
   ON pa.dbid = d.database_id
 WHERE pa.dbid NOT IN (1, 3, 4, 32761, 32767, ISNULL(DB_ID(N''PerformanceMonitor''), 0))
+AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 ) AS combined
 ORDER BY total_elapsed_time DESC
 OPTION(RECOMPILE);' AS nvarchar(max));
@@ -158,11 +186,13 @@ No trigger stats or function stats — Azure SQL DB scope is single-database. */
         const string azureSqlDbQuery = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT TOP (150)
+SELECT /* PerformanceMonitorLite */ TOP (150)
     database_name = DB_NAME(),
     schema_name = OBJECT_SCHEMA_NAME(s.object_id, s.database_id),
     object_name = OBJECT_NAME(s.object_id, s.database_id),
     object_type = N'PROCEDURE',
+    cached_time = s.cached_time,
+    last_execution_time = s.last_execution_time,
     execution_count = s.execution_count,
     total_worker_time = s.total_worker_time,
     total_elapsed_time = s.total_elapsed_time,
@@ -173,11 +203,20 @@ SELECT TOP (150)
     max_worker_time = s.max_worker_time,
     min_elapsed_time = s.min_elapsed_time,
     max_elapsed_time = s.max_elapsed_time,
+    min_logical_reads = s.min_logical_reads,
+    max_logical_reads = s.max_logical_reads,
+    min_physical_reads = s.min_physical_reads,
+    max_physical_reads = s.max_physical_reads,
+    min_logical_writes = s.min_logical_writes,
+    max_logical_writes = s.max_logical_writes,
     total_spills = ISNULL(s.total_spills, 0),
+    min_spills = ISNULL(s.min_spills, 0),
+    max_spills = ISNULL(s.max_spills, 0),
     sql_handle = CONVERT(varchar(64), s.sql_handle, 1),
     plan_handle = CONVERT(varchar(64), s.plan_handle, 1)
 FROM sys.dm_exec_procedure_stats AS s
 WHERE s.database_id = DB_ID()
+AND   s.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 ORDER BY s.total_elapsed_time DESC
 OPTION(RECOMPILE);";
 
@@ -208,26 +247,34 @@ ORDER BY s.total_elapsed_time DESC
             {
                 while (await reader.ReadAsync(cancellationToken))
                 {
+                    /* Reader ordinals match SELECT column order:
+                       0=database_name, 1=schema_name, 2=object_name, 3=object_type,
+                       4=cached_time, 5=last_execution_time,
+                       6=execution_count, 7=total_worker_time, 8=total_elapsed_time,
+                       9=total_logical_reads, 10=total_physical_reads, 11=total_logical_writes,
+                       12=min_worker_time, 13=max_worker_time, 14=min_elapsed_time, 15=max_elapsed_time,
+                       16=min_logical_reads, 17=max_logical_reads, 18=min_physical_reads, 19=max_physical_reads,
+                       20=min_logical_writes, 21=max_logical_writes,
+                       22=total_spills, 23=min_spills, 24=max_spills,
+                       25=sql_handle, 26=plan_handle */
                     var dbName = reader.IsDBNull(0) ? "" : reader.GetString(0);
                     var schemaName = reader.IsDBNull(1) ? "" : reader.GetString(1);
                     var objectName = reader.IsDBNull(2) ? "" : reader.GetString(2);
                     var objectType = reader.IsDBNull(3) ? "" : reader.GetString(3);
-                    var execCount = reader.GetInt64(4);
-                    var workerTime = reader.GetInt64(5);
-                    var elapsedTime = reader.GetInt64(6);
-                    var logicalReads = reader.GetInt64(7);
-                    var physicalReads = reader.GetInt64(8);
-                    var logicalWrites = reader.GetInt64(9);
-                    var minWorkerTime = reader.GetInt64(10);
-                    var maxWorkerTime = reader.GetInt64(11);
-                    var minElapsedTime = reader.GetInt64(12);
-                    var maxElapsedTime = reader.GetInt64(13);
-                    var totalSpills = reader.GetInt64(14);
-                    var sqlHandle = reader.IsDBNull(15) ? (string?)null : reader.GetString(15);
-                    var planHandle = reader.IsDBNull(16) ? (string?)null : reader.GetString(16);
+                    var cachedTime = reader.IsDBNull(4) ? (DateTime?)null : reader.GetDateTime(4);
+                    var lastExecTime = reader.IsDBNull(5) ? (DateTime?)null : reader.GetDateTime(5);
+                    var execCount = reader.GetInt64(6);
+                    var workerTime = reader.GetInt64(7);
+                    var elapsedTime = reader.GetInt64(8);
+                    var logicalReads = reader.GetInt64(9);
+                    var physicalReads = reader.GetInt64(10);
+                    var logicalWrites = reader.GetInt64(11);
+                    var sqlHandle = reader.IsDBNull(25) ? (string?)null : reader.GetString(25);
+                    var planHandle = reader.IsDBNull(26) ? (string?)null : reader.GetString(26);
 
-                    /* Delta key: database.schema.object */
-                    var deltaKey = $"{dbName}.{schemaName}.{objectName}";
+                    /* Delta key: plan_handle to prevent cross-contamination
+                       when multiple plans exist for the same object */
+                    var deltaKey = planHandle ?? $"{dbName}.{schemaName}.{objectName}";
                     var deltaExec = _deltaCalculator.CalculateDelta(serverId, "proc_stats_exec", deltaKey, execCount);
                     var deltaWorker = _deltaCalculator.CalculateDelta(serverId, "proc_stats_worker", deltaKey, workerTime);
                     var deltaElapsed = _deltaCalculator.CalculateDelta(serverId, "proc_stats_elapsed", deltaKey, elapsedTime);
@@ -235,34 +282,45 @@ ORDER BY s.total_elapsed_time DESC
                     var deltaWrites = _deltaCalculator.CalculateDelta(serverId, "proc_stats_writes", deltaKey, logicalWrites);
                     var deltaPhysReads = _deltaCalculator.CalculateDelta(serverId, "proc_stats_phys_reads", deltaKey, physicalReads);
 
+                    /* Appender column order must match DuckDB table definition exactly */
                     var row = appender.CreateRow();
-                    row.AppendValue(GenerateCollectionId())
-                       .AppendValue(collectionTime)
-                       .AppendValue(serverId)
-                       .AppendValue(server.ServerName)
-                       .AppendValue(dbName)
-                       .AppendValue(schemaName)
-                       .AppendValue(objectName)
-                       .AppendValue(objectType)
-                       .AppendValue(execCount)
-                       .AppendValue(workerTime)
-                       .AppendValue(elapsedTime)
-                       .AppendValue(logicalReads)
-                       .AppendValue(physicalReads)
-                       .AppendValue(logicalWrites)
-                       .AppendValue(minWorkerTime)
-                       .AppendValue(maxWorkerTime)
-                       .AppendValue(minElapsedTime)
-                       .AppendValue(maxElapsedTime)
-                       .AppendValue(totalSpills)
-                       .AppendValue(sqlHandle)
-                       .AppendValue(planHandle)
-                       .AppendValue(deltaExec)
-                       .AppendValue(deltaWorker)
-                       .AppendValue(deltaElapsed)
-                       .AppendValue(deltaReads)
-                       .AppendValue(deltaWrites)
-                       .AppendValue(deltaPhysReads)
+                    row.AppendValue(GenerateCollectionId())                                     /* collection_id */
+                       .AppendValue(collectionTime)                                             /* collection_time */
+                       .AppendValue(serverId)                                                   /* server_id */
+                       .AppendValue(server.ServerName)                                          /* server_name */
+                       .AppendValue(dbName)                                                     /* database_name */
+                       .AppendValue(schemaName)                                                 /* schema_name */
+                       .AppendValue(objectName)                                                 /* object_name */
+                       .AppendValue(objectType)                                                 /* object_type */
+                       .AppendValue(cachedTime)                                                 /* cached_time */
+                       .AppendValue(lastExecTime)                                               /* last_execution_time */
+                       .AppendValue(execCount)                                                  /* execution_count */
+                       .AppendValue(workerTime)                                                 /* total_worker_time */
+                       .AppendValue(elapsedTime)                                                /* total_elapsed_time */
+                       .AppendValue(logicalReads)                                               /* total_logical_reads */
+                       .AppendValue(physicalReads)                                              /* total_physical_reads */
+                       .AppendValue(logicalWrites)                                              /* total_logical_writes */
+                       .AppendValue(reader.IsDBNull(12) ? 0L : reader.GetInt64(12))             /* min_worker_time */
+                       .AppendValue(reader.IsDBNull(13) ? 0L : reader.GetInt64(13))             /* max_worker_time */
+                       .AppendValue(reader.IsDBNull(14) ? 0L : reader.GetInt64(14))             /* min_elapsed_time */
+                       .AppendValue(reader.IsDBNull(15) ? 0L : reader.GetInt64(15))             /* max_elapsed_time */
+                       .AppendValue(reader.IsDBNull(16) ? 0L : reader.GetInt64(16))             /* min_logical_reads */
+                       .AppendValue(reader.IsDBNull(17) ? 0L : reader.GetInt64(17))             /* max_logical_reads */
+                       .AppendValue(reader.IsDBNull(18) ? 0L : reader.GetInt64(18))             /* min_physical_reads */
+                       .AppendValue(reader.IsDBNull(19) ? 0L : reader.GetInt64(19))             /* max_physical_reads */
+                       .AppendValue(reader.IsDBNull(20) ? 0L : reader.GetInt64(20))             /* min_logical_writes */
+                       .AppendValue(reader.IsDBNull(21) ? 0L : reader.GetInt64(21))             /* max_logical_writes */
+                       .AppendValue(reader.GetInt64(22))                                        /* total_spills */
+                       .AppendValue(reader.GetInt64(23))                                        /* min_spills */
+                       .AppendValue(reader.GetInt64(24))                                        /* max_spills */
+                       .AppendValue(sqlHandle)                                                  /* sql_handle */
+                       .AppendValue(planHandle)                                                 /* plan_handle */
+                       .AppendValue(deltaExec)                                                  /* delta_execution_count */
+                       .AppendValue(deltaWorker)                                                /* delta_worker_time */
+                       .AppendValue(deltaElapsed)                                               /* delta_elapsed_time */
+                       .AppendValue(deltaReads)                                                 /* delta_logical_reads */
+                       .AppendValue(deltaWrites)                                                /* delta_logical_writes */
+                       .AppendValue(deltaPhysReads)                                             /* delta_physical_reads */
                        .EndRow();
 
                     rowsCollected++;
diff --git a/Lite/Services/RemoteCollectorService.QuerySnapshots.cs b/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
index 894a8221..b2cb66de 100644
--- a/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
+++ b/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
@@ -19,21 +19,11 @@ namespace PerformanceMonitorLite.Services;
 
 public partial class RemoteCollectorService
 {
-    /// <summary>
-    /// Collects currently running queries (point-in-time snapshot).
-    /// </summary>
-    private async Task<int> CollectQuerySnapshotsAsync(ServerConnection server, CancellationToken cancellationToken)
-    {
-        // dm_exec_query_statistics_xml requires SQL Server 2016 SP1+ (version 13)
-        var serverStatus = _serverManager.GetConnectionStatus(server.Id);
-        var supportsLiveQueryPlan = serverStatus.SqlMajorVersion >= 13 || serverStatus.SqlMajorVersion == 0
-            || serverStatus.SqlEngineEdition == 5 || serverStatus.SqlEngineEdition == 8;
-
-        const string queryBase = @"
+    private const string QuerySnapshotsBase = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SET LOCK_TIMEOUT 1000;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     der.session_id,
     database_name = DB_NAME(der.database_id),
     elapsed_time_formatted =
@@ -71,8 +61,15 @@ WHEN 5 THEN 'Snapshot'
             ELSE '???'
         END,
     der.dop,
-    der.parallel_worker_count
+    der.parallel_worker_count,
+    des.login_name,
+    des.host_name,
+    des.program_name,
+    des.open_transaction_count,
+    der.percent_complete
 FROM sys.dm_exec_requests AS der
+JOIN sys.dm_exec_sessions AS des
+    ON des.session_id = der.session_id
 OUTER APPLY sys.dm_exec_sql_text(der.plan_handle) AS dest
 OUTER APPLY sys.dm_exec_text_query_plan(der.plan_handle, der.statement_start_offset, der.statement_end_offset) AS deqp
 {1}
@@ -83,9 +80,28 @@ AND   dest.text IS NOT NULL
 ORDER BY der.cpu_time DESC, der.parallel_worker_count DESC
 OPTION(MAXDOP 1, RECOMPILE);";
 
-        var query = supportsLiveQueryPlan
-            ? string.Format(queryBase, "live_query_plan = deqs.query_plan,", "OUTER APPLY sys.dm_exec_query_statistics_xml(der.session_id) AS deqs")
-            : string.Format(queryBase, "live_query_plan = CONVERT(xml, NULL),", "");
+    /// <summary>
+    /// Builds the query snapshots SQL with or without live query plan support.
+    /// Used by both the collector and the live snapshot button.
+    /// </summary>
+    internal static string BuildQuerySnapshotsQuery(bool supportsLiveQueryPlan)
+    {
+        return supportsLiveQueryPlan
+            ? string.Format(QuerySnapshotsBase, "live_query_plan = deqs.query_plan,", "OUTER APPLY sys.dm_exec_query_statistics_xml(der.session_id) AS deqs")
+            : string.Format(QuerySnapshotsBase, "live_query_plan = CONVERT(xml, NULL),", "");
+    }
+
+    /// <summary>
+    /// Collects currently running queries (point-in-time snapshot).
+    /// </summary>
+    private async Task<int> CollectQuerySnapshotsAsync(ServerConnection server, CancellationToken cancellationToken)
+    {
+        // dm_exec_query_statistics_xml requires SQL Server 2016 SP1+ (version 13)
+        var serverStatus = _serverManager.GetConnectionStatus(server.Id);
+        var supportsLiveQueryPlan = serverStatus.SqlMajorVersion >= 13 || serverStatus.SqlMajorVersion == 0
+            || serverStatus.SqlEngineEdition == 5 || serverStatus.SqlEngineEdition == 8;
+
+        var query = BuildQuerySnapshotsQuery(supportsLiveQueryPlan);
 
         var serverId = GetServerId(server);
         var collectionTime = DateTime.UtcNow;
@@ -137,6 +153,11 @@ AND   dest.text IS NOT NULL
                        .AppendValue(reader.IsDBNull(17) ? (string?)null : reader.GetString(17))                /* transaction_isolation_level */
                        .AppendValue(reader.IsDBNull(18) ? 0 : Convert.ToInt32(reader.GetValue(18)))            /* dop */
                        .AppendValue(reader.IsDBNull(19) ? 0 : Convert.ToInt32(reader.GetValue(19)))            /* parallel_worker_count */
+                       .AppendValue(reader.IsDBNull(20) ? (string?)null : reader.GetString(20))                /* login_name */
+                       .AppendValue(reader.IsDBNull(21) ? (string?)null : reader.GetString(21))                /* host_name */
+                       .AppendValue(reader.IsDBNull(22) ? (string?)null : reader.GetString(22))                /* program_name */
+                       .AppendValue(reader.IsDBNull(23) ? 0 : Convert.ToInt32(reader.GetValue(23)))            /* open_transaction_count */
+                       .AppendValue(reader.IsDBNull(24) ? 0m : Convert.ToDecimal(reader.GetValue(24)))        /* percent_complete */
                        .EndRow();
 
                     rowsCollected++;
diff --git a/Lite/Services/RemoteCollectorService.QueryStats.cs b/Lite/Services/RemoteCollectorService.QueryStats.cs
index 16774801..b8b0962d 100644
--- a/Lite/Services/RemoteCollectorService.QueryStats.cs
+++ b/Lite/Services/RemoteCollectorService.QueryStats.cs
@@ -34,24 +34,43 @@ Use a simplified query that skips plan_attributes entirely — there's only one
         const string standardQuery = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT TOP (50)
+SELECT /* PerformanceMonitorLite */ TOP (200)
     database_name = d.name,
     query_hash = CONVERT(varchar(64), qs.query_hash, 1),
     query_plan_hash = CONVERT(varchar(64), qs.query_plan_hash, 1),
+    creation_time = qs.creation_time,
+    last_execution_time = qs.last_execution_time,
     execution_count = qs.execution_count,
     total_worker_time = qs.total_worker_time,
     total_elapsed_time = qs.total_elapsed_time,
     total_logical_reads = qs.total_logical_reads,
     total_logical_writes = qs.total_logical_writes,
     total_physical_reads = qs.total_physical_reads,
+    total_clr_time = qs.total_clr_time,
     total_rows = qs.total_rows,
     total_spills = qs.total_spills,
     min_worker_time = qs.min_worker_time,
     max_worker_time = qs.max_worker_time,
     min_elapsed_time = qs.min_elapsed_time,
     max_elapsed_time = qs.max_elapsed_time,
+    min_physical_reads = qs.min_physical_reads,
+    max_physical_reads = qs.max_physical_reads,
+    min_rows = qs.min_rows,
+    max_rows = qs.max_rows,
     min_dop = qs.min_dop,
     max_dop = qs.max_dop,
+    min_grant_kb = qs.min_grant_kb,
+    max_grant_kb = qs.max_grant_kb,
+    min_used_grant_kb = qs.min_used_grant_kb,
+    max_used_grant_kb = qs.max_used_grant_kb,
+    min_ideal_grant_kb = qs.min_ideal_grant_kb,
+    max_ideal_grant_kb = qs.max_ideal_grant_kb,
+    min_reserved_threads = qs.min_reserved_threads,
+    max_reserved_threads = qs.max_reserved_threads,
+    min_used_threads = qs.min_used_threads,
+    max_used_threads = qs.max_used_threads,
+    min_spills = qs.min_spills,
+    max_spills = qs.max_spills,
     sql_handle = CONVERT(varchar(64), qs.sql_handle, 1),
     plan_handle = CONVERT(varchar(64), qs.plan_handle, 1),
     query_text =
@@ -85,6 +104,8 @@ FROM sys.dm_exec_plan_attributes(qs.plan_handle) AS pa
 INNER JOIN sys.databases AS d
   ON pa.dbid = d.database_id
 WHERE pa.dbid NOT IN (1, 2, 3, 4, 32761, 32767, ISNULL(DB_ID(N'PerformanceMonitor'), 0))
+AND   st.text NOT LIKE N'%PerformanceMonitorLite%'
+AND   qs.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 ORDER BY
     qs.total_elapsed_time DESC
 OPTION(RECOMPILE);";
@@ -93,24 +114,43 @@ qs.total_elapsed_time DESC
         const string azureSqlDbQuery = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT TOP (50)
+SELECT /* PerformanceMonitorLite */ TOP (200)
     database_name = DB_NAME(),
     query_hash = CONVERT(varchar(64), qs.query_hash, 1),
     query_plan_hash = CONVERT(varchar(64), qs.query_plan_hash, 1),
+    creation_time = qs.creation_time,
+    last_execution_time = qs.last_execution_time,
     execution_count = qs.execution_count,
     total_worker_time = qs.total_worker_time,
     total_elapsed_time = qs.total_elapsed_time,
     total_logical_reads = qs.total_logical_reads,
     total_logical_writes = qs.total_logical_writes,
     total_physical_reads = qs.total_physical_reads,
+    total_clr_time = qs.total_clr_time,
     total_rows = qs.total_rows,
     total_spills = qs.total_spills,
     min_worker_time = qs.min_worker_time,
     max_worker_time = qs.max_worker_time,
     min_elapsed_time = qs.min_elapsed_time,
     max_elapsed_time = qs.max_elapsed_time,
+    min_physical_reads = qs.min_physical_reads,
+    max_physical_reads = qs.max_physical_reads,
+    min_rows = qs.min_rows,
+    max_rows = qs.max_rows,
     min_dop = qs.min_dop,
     max_dop = qs.max_dop,
+    min_grant_kb = qs.min_grant_kb,
+    max_grant_kb = qs.max_grant_kb,
+    min_used_grant_kb = qs.min_used_grant_kb,
+    max_used_grant_kb = qs.max_used_grant_kb,
+    min_ideal_grant_kb = qs.min_ideal_grant_kb,
+    max_ideal_grant_kb = qs.max_ideal_grant_kb,
+    min_reserved_threads = qs.min_reserved_threads,
+    max_reserved_threads = qs.max_reserved_threads,
+    min_used_threads = qs.min_used_threads,
+    max_used_threads = qs.max_used_threads,
+    min_spills = qs.min_spills,
+    max_spills = qs.max_spills,
     sql_handle = CONVERT(varchar(64), qs.sql_handle, 1),
     plan_handle = CONVERT(varchar(64), qs.plan_handle, 1),
     query_text =
@@ -134,6 +174,8 @@ ELSE qs.statement_end_offset
         END
 FROM sys.dm_exec_query_stats AS qs
 OUTER APPLY sys.dm_exec_sql_text(qs.sql_handle) AS st
+WHERE st.text NOT LIKE N'%PerformanceMonitorLite%'
+AND   qs.last_execution_time >= DATEADD(MINUTE, -10, GETDATE())
 ORDER BY
     qs.total_elapsed_time DESC
 OPTION(RECOMPILE);";
@@ -165,68 +207,101 @@ qs.total_elapsed_time DESC
             {
                 while (await reader.ReadAsync(cancellationToken))
                 {
+                    /* Reader ordinals match SELECT column order:
+                       0=database_name, 1=query_hash, 2=query_plan_hash,
+                       3=creation_time, 4=last_execution_time,
+                       5=execution_count, 6=total_worker_time, 7=total_elapsed_time,
+                       8=total_logical_reads, 9=total_logical_writes, 10=total_physical_reads,
+                       11=total_clr_time, 12=total_rows, 13=total_spills,
+                       14=min_worker_time, 15=max_worker_time, 16=min_elapsed_time, 17=max_elapsed_time,
+                       18=min_physical_reads, 19=max_physical_reads, 20=min_rows, 21=max_rows,
+                       22=min_dop, 23=max_dop,
+                       24=min_grant_kb, 25=max_grant_kb, 26=min_used_grant_kb, 27=max_used_grant_kb,
+                       28=min_ideal_grant_kb, 29=max_ideal_grant_kb,
+                       30=min_reserved_threads, 31=max_reserved_threads, 32=min_used_threads, 33=max_used_threads,
+                       34=min_spills, 35=max_spills,
+                       36=sql_handle, 37=plan_handle, 38=query_text */
                     var queryHash = reader.IsDBNull(1) ? "" : reader.GetString(1);
-                    var executionCount = reader.IsDBNull(3) ? 0L : reader.GetInt64(3);
-                    var totalWorkerTime = reader.IsDBNull(4) ? 0L : reader.GetInt64(4);
-                    var totalElapsedTime = reader.IsDBNull(5) ? 0L : reader.GetInt64(5);
-                    var totalLogicalReads = reader.IsDBNull(6) ? 0L : reader.GetInt64(6);
-                    var totalLogicalWrites = reader.IsDBNull(7) ? 0L : reader.GetInt64(7);
-                    var totalPhysicalReads = reader.IsDBNull(8) ? 0L : reader.GetInt64(8);
-                    var totalRows = reader.IsDBNull(9) ? 0L : reader.GetInt64(9);
-                    var totalSpills = reader.IsDBNull(10) ? 0L : reader.GetInt64(10);
-                    var minWorkerTime = reader.IsDBNull(11) ? 0L : reader.GetInt64(11);
-                    var maxWorkerTime = reader.IsDBNull(12) ? 0L : reader.GetInt64(12);
-                    var minElapsedTime = reader.IsDBNull(13) ? 0L : reader.GetInt64(13);
-                    var maxElapsedTime = reader.IsDBNull(14) ? 0L : reader.GetInt64(14);
-                    var minDop = reader.IsDBNull(15) ? 0 : Convert.ToInt32(reader.GetValue(15));
-                    var maxDop = reader.IsDBNull(16) ? 0 : Convert.ToInt32(reader.GetValue(16));
-                    var sqlHandle = reader.IsDBNull(17) ? (string?)null : reader.GetString(17);
-                    var planHandle = reader.IsDBNull(18) ? (string?)null : reader.GetString(18);
-
-                    /* Delta calculations based on query_hash */
-                    var deltaExecCount = _deltaCalculator.CalculateDelta(serverId, "query_stats_exec", queryHash, executionCount);
-                    var deltaWorkerTime = _deltaCalculator.CalculateDelta(serverId, "query_stats_worker", queryHash, totalWorkerTime);
-                    var deltaElapsedTime = _deltaCalculator.CalculateDelta(serverId, "query_stats_elapsed", queryHash, totalElapsedTime);
-                    var deltaLogicalReads = _deltaCalculator.CalculateDelta(serverId, "query_stats_reads", queryHash, totalLogicalReads);
-                    var deltaLogicalWrites = _deltaCalculator.CalculateDelta(serverId, "query_stats_writes", queryHash, totalLogicalWrites);
-                    var deltaPhysicalReads = _deltaCalculator.CalculateDelta(serverId, "query_stats_phys_reads", queryHash, totalPhysicalReads);
-                    var deltaRows = _deltaCalculator.CalculateDelta(serverId, "query_stats_rows", queryHash, totalRows);
-                    var deltaSpills = _deltaCalculator.CalculateDelta(serverId, "query_stats_spills", queryHash, totalSpills);
+                    var creationTime = reader.IsDBNull(3) ? (DateTime?)null : reader.GetDateTime(3);
+                    var lastExecTime = reader.IsDBNull(4) ? (DateTime?)null : reader.GetDateTime(4);
+                    var executionCount = reader.IsDBNull(5) ? 0L : reader.GetInt64(5);
+                    var totalWorkerTime = reader.IsDBNull(6) ? 0L : reader.GetInt64(6);
+                    var totalElapsedTime = reader.IsDBNull(7) ? 0L : reader.GetInt64(7);
+                    var totalLogicalReads = reader.IsDBNull(8) ? 0L : reader.GetInt64(8);
+                    var totalLogicalWrites = reader.IsDBNull(9) ? 0L : reader.GetInt64(9);
+                    var totalPhysicalReads = reader.IsDBNull(10) ? 0L : reader.GetInt64(10);
+                    var totalClrTime = reader.IsDBNull(11) ? 0L : reader.GetInt64(11);
+                    var totalRows = reader.IsDBNull(12) ? 0L : reader.GetInt64(12);
+                    var totalSpills = reader.IsDBNull(13) ? 0L : reader.GetInt64(13);
+                    var sqlHandle = reader.IsDBNull(36) ? (string?)null : reader.GetString(36);
+                    var planHandle = reader.IsDBNull(37) ? (string?)null : reader.GetString(37);
 
+                    /* Delta calculations keyed by plan_handle to prevent cross-contamination
+                       when multiple plans exist for the same query_hash */
+                    var deltaKey = planHandle ?? queryHash;
+                    var deltaExecCount = _deltaCalculator.CalculateDelta(serverId, "query_stats_exec", deltaKey, executionCount);
+                    var deltaWorkerTime = _deltaCalculator.CalculateDelta(serverId, "query_stats_worker", deltaKey, totalWorkerTime);
+                    var deltaElapsedTime = _deltaCalculator.CalculateDelta(serverId, "query_stats_elapsed", deltaKey, totalElapsedTime);
+                    var deltaLogicalReads = _deltaCalculator.CalculateDelta(serverId, "query_stats_reads", deltaKey, totalLogicalReads);
+                    var deltaLogicalWrites = _deltaCalculator.CalculateDelta(serverId, "query_stats_writes", deltaKey, totalLogicalWrites);
+                    var deltaPhysicalReads = _deltaCalculator.CalculateDelta(serverId, "query_stats_phys_reads", deltaKey, totalPhysicalReads);
+                    var deltaRows = _deltaCalculator.CalculateDelta(serverId, "query_stats_rows", deltaKey, totalRows);
+                    var deltaSpills = _deltaCalculator.CalculateDelta(serverId, "query_stats_spills", deltaKey, totalSpills);
+
+                    /* Appender column order must match DuckDB table definition exactly */
                     var row = appender.CreateRow();
-                    row.AppendValue(GenerateCollectionId())
-                       .AppendValue(collectionTime)
-                       .AppendValue(serverId)
-                       .AppendValue(server.ServerName)
-                       .AppendValue(reader.IsDBNull(0) ? (string?)null : reader.GetString(0))
-                       .AppendValue(queryHash)
-                       .AppendValue(reader.IsDBNull(2) ? (string?)null : reader.GetString(2))
-                       .AppendValue(executionCount)
-                       .AppendValue(totalWorkerTime)
-                       .AppendValue(totalElapsedTime)
-                       .AppendValue(totalLogicalReads)
-                       .AppendValue(totalLogicalWrites)
-                       .AppendValue(totalPhysicalReads)
-                       .AppendValue(totalRows)
-                       .AppendValue(totalSpills)
-                       .AppendValue(minWorkerTime)
-                       .AppendValue(maxWorkerTime)
-                       .AppendValue(minElapsedTime)
-                       .AppendValue(maxElapsedTime)
-                       .AppendValue(minDop)
-                       .AppendValue(maxDop)
-                       .AppendValue(reader.IsDBNull(19) ? (string?)null : reader.GetString(19))
-                       .AppendValue((string?)null) /* query plans retrieved on-demand */
-                       .AppendValue(sqlHandle)
-                       .AppendValue(planHandle)
-                       .AppendValue(deltaExecCount)
-                       .AppendValue(deltaWorkerTime)
-                       .AppendValue(deltaElapsedTime)
-                       .AppendValue(deltaLogicalReads)
-                       .AppendValue(deltaLogicalWrites)
-                       .AppendValue(deltaPhysicalReads)
-                       .AppendValue(deltaRows)
-                       .AppendValue(deltaSpills)
+                    row.AppendValue(GenerateCollectionId())                                                 /* collection_id */
+                       .AppendValue(collectionTime)                                                         /* collection_time */
+                       .AppendValue(serverId)                                                               /* server_id */
+                       .AppendValue(server.ServerName)                                                      /* server_name */
+                       .AppendValue(reader.IsDBNull(0) ? (string?)null : reader.GetString(0))               /* database_name */
+                       .AppendValue(queryHash)                                                              /* query_hash */
+                       .AppendValue(reader.IsDBNull(2) ? (string?)null : reader.GetString(2))               /* query_plan_hash */
+                       .AppendValue(creationTime)                                                           /* creation_time */
+                       .AppendValue(lastExecTime)                                                           /* last_execution_time */
+                       .AppendValue(executionCount)                                                         /* execution_count */
+                       .AppendValue(totalWorkerTime)                                                        /* total_worker_time */
+                       .AppendValue(totalElapsedTime)                                                       /* total_elapsed_time */
+                       .AppendValue(totalLogicalReads)                                                      /* total_logical_reads */
+                       .AppendValue(totalLogicalWrites)                                                     /* total_logical_writes */
+                       .AppendValue(totalPhysicalReads)                                                     /* total_physical_reads */
+                       .AppendValue(totalClrTime)                                                           /* total_clr_time */
+                       .AppendValue(totalRows)                                                              /* total_rows */
+                       .AppendValue(totalSpills)                                                            /* total_spills */
+                       .AppendValue(reader.IsDBNull(14) ? 0L : reader.GetInt64(14))                         /* min_worker_time */
+                       .AppendValue(reader.IsDBNull(15) ? 0L : reader.GetInt64(15))                         /* max_worker_time */
+                       .AppendValue(reader.IsDBNull(16) ? 0L : reader.GetInt64(16))                         /* min_elapsed_time */
+                       .AppendValue(reader.IsDBNull(17) ? 0L : reader.GetInt64(17))                         /* max_elapsed_time */
+                       .AppendValue(reader.IsDBNull(18) ? 0L : reader.GetInt64(18))                         /* min_physical_reads */
+                       .AppendValue(reader.IsDBNull(19) ? 0L : reader.GetInt64(19))                         /* max_physical_reads */
+                       .AppendValue(reader.IsDBNull(20) ? 0L : reader.GetInt64(20))                         /* min_rows */
+                       .AppendValue(reader.IsDBNull(21) ? 0L : reader.GetInt64(21))                         /* max_rows */
+                       .AppendValue(reader.IsDBNull(22) ? 0 : Convert.ToInt32(reader.GetValue(22)))         /* min_dop */
+                       .AppendValue(reader.IsDBNull(23) ? 0 : Convert.ToInt32(reader.GetValue(23)))         /* max_dop */
+                       .AppendValue(reader.IsDBNull(24) ? 0L : reader.GetInt64(24))                         /* min_grant_kb */
+                       .AppendValue(reader.IsDBNull(25) ? 0L : reader.GetInt64(25))                         /* max_grant_kb */
+                       .AppendValue(reader.IsDBNull(26) ? 0L : reader.GetInt64(26))                         /* min_used_grant_kb */
+                       .AppendValue(reader.IsDBNull(27) ? 0L : reader.GetInt64(27))                         /* max_used_grant_kb */
+                       .AppendValue(reader.IsDBNull(28) ? 0L : reader.GetInt64(28))                         /* min_ideal_grant_kb */
+                       .AppendValue(reader.IsDBNull(29) ? 0L : reader.GetInt64(29))                         /* max_ideal_grant_kb */
+                       .AppendValue(reader.IsDBNull(30) ? 0L : reader.GetInt64(30))                         /* min_reserved_threads */
+                       .AppendValue(reader.IsDBNull(31) ? 0L : reader.GetInt64(31))                         /* max_reserved_threads */
+                       .AppendValue(reader.IsDBNull(32) ? 0L : reader.GetInt64(32))                         /* min_used_threads */
+                       .AppendValue(reader.IsDBNull(33) ? 0L : reader.GetInt64(33))                         /* max_used_threads */
+                       .AppendValue(reader.IsDBNull(34) ? 0L : reader.GetInt64(34))                         /* min_spills */
+                       .AppendValue(reader.IsDBNull(35) ? 0L : reader.GetInt64(35))                         /* max_spills */
+                       .AppendValue(reader.IsDBNull(38) ? (string?)null : reader.GetString(38))             /* query_text */
+                       .AppendValue((string?)null)                                                          /* query_plan_xml — retrieved on-demand */
+                       .AppendValue(sqlHandle)                                                              /* sql_handle */
+                       .AppendValue(planHandle)                                                             /* plan_handle */
+                       .AppendValue(deltaExecCount)                                                         /* delta_execution_count */
+                       .AppendValue(deltaWorkerTime)                                                        /* delta_worker_time */
+                       .AppendValue(deltaElapsedTime)                                                       /* delta_elapsed_time */
+                       .AppendValue(deltaLogicalReads)                                                      /* delta_logical_reads */
+                       .AppendValue(deltaLogicalWrites)                                                     /* delta_logical_writes */
+                       .AppendValue(deltaPhysicalReads)                                                     /* delta_physical_reads */
+                       .AppendValue(deltaRows)                                                              /* delta_rows */
+                       .AppendValue(deltaSpills)                                                            /* delta_spills */
                        .EndRow();
 
                     rowsCollected++;
diff --git a/Lite/Services/RemoteCollectorService.QueryStore.cs b/Lite/Services/RemoteCollectorService.QueryStore.cs
index 6f69db5e..737dd7ff 100644
--- a/Lite/Services/RemoteCollectorService.QueryStore.cs
+++ b/Lite/Services/RemoteCollectorService.QueryStore.cs
@@ -22,23 +22,73 @@ public partial class RemoteCollectorService
 {
     /// <summary>
     /// Collects Query Store data from databases that have it enabled.
+    /// Matches Dashboard column parity with version-gated columns for SQL 2017+ and 2022+.
     /// </summary>
     private async Task<int> CollectQueryStoreAsync(ServerConnection server, CancellationToken cancellationToken)
     {
-        /* First, get databases with Query Store enabled */
+        /* First, get databases with Query Store actually enabled.
+           Uses sys.database_query_store_options.actual_state instead of
+           sys.databases.is_query_store_on, which can be out of sync on Azure SQL DB. */
         const string dbQuery = @"
+SET NOCOUNT ON;
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
+DECLARE
+    @result TABLE (name sysname);
+
+DECLARE
+    @db sysname,
+    @sql NVARCHAR(500);
+
+DECLARE db_check CURSOR LOCAL FAST_FORWARD FOR
+    SELECT /* PerformanceMonitorLite */
+        d.name
+    FROM sys.databases AS d
+    WHERE d.database_id > 4
+    AND   d.database_id < 32761
+    AND   d.state_desc = N'ONLINE'
+    AND   d.name <> N'PerformanceMonitor'
+    OPTION(RECOMPILE);
+
+OPEN db_check;
+
+FETCH NEXT
+FROM db_check
+INTO @db;
+
+WHILE @@FETCH_STATUS = 0
+BEGIN
+    BEGIN TRY
+        SET @sql =
+            N'USE ' + QUOTENAME(@db) + N';
+            SELECT ' + QUOTENAME(@db, '''') + N'
+            WHERE EXISTS
+            (
+                SELECT
+                    1
+                FROM sys.database_query_store_options
+                WHERE actual_state > 0
+            );';
+
+        INSERT @result (name)
+        EXEC(@sql);
+    END TRY
+    BEGIN CATCH
+    END CATCH;
+
+    FETCH NEXT
+    FROM db_check
+    INTO @db;
+END;
+
+CLOSE db_check;
+DEALLOCATE db_check;
+
 SELECT
-    d.name
-FROM sys.databases AS d
-WHERE d.is_query_store_on = 1
-AND   d.database_id > 4
-AND   d.database_id < 32761
-AND   d.state_desc = N'ONLINE'
-AND   d.name <> N'PerformanceMonitor'
-ORDER BY d.name
-OPTION(RECOMPILE);";
+    name
+FROM @result
+ORDER BY
+    name;";
 
         var serverId = GetServerId(server);
         var collectionTime = DateTime.UtcNow;
@@ -73,6 +123,53 @@ ORDER BY d.name
             return 0;
         }
 
+        /* Detect server version for version-gated columns.
+           @isNew = true for SQL Server 2017+ (product version > 13) or Azure SQL DB/MI (engine 5/8).
+           Controls: avg_num_physical_io_reads, avg_log_bytes_used, avg_tempdb_space_used, plan_forcing_type_desc.
+           @hasPlanType = true for SQL Server 2022+ (product version >= 16).
+           Controls: plan_type_desc. */
+        var serverStatus = _serverManager.GetConnectionStatus(server.Id);
+        int productVersion = 13; /* default to SQL 2016 */
+        try
+        {
+            using var versionCmd = new SqlCommand(
+                "SELECT CONVERT(integer, PARSENAME(CONVERT(sysname, SERVERPROPERTY('PRODUCTVERSION')), 4))",
+                sqlConnection);
+            versionCmd.CommandTimeout = 10;
+            var versionResult = await versionCmd.ExecuteScalarAsync(cancellationToken);
+            if (versionResult != null && versionResult != DBNull.Value)
+                productVersion = Convert.ToInt32(versionResult);
+        }
+        catch
+        {
+            /* Fall back to 13 (SQL 2016) if version detection fails */
+        }
+
+        bool isNew = productVersion > 13 || serverStatus.SqlEngineEdition == 5 || serverStatus.SqlEngineEdition == 8;
+        bool hasPlanType = productVersion >= 16;
+
+        /* Build version-conditional column fragments for the Query Store query.
+           These are injected into the sp_executesql parameter string — no single quotes needed. */
+        string numPhysIoReadsCols = isNew
+            ? "qsrs.avg_num_physical_io_reads, qsrs.min_num_physical_io_reads, qsrs.max_num_physical_io_reads,"
+            : "avg_num_physical_io_reads = NULL, min_num_physical_io_reads = NULL, max_num_physical_io_reads = NULL,";
+
+        string logBytesCols = isNew
+            ? "avg_log_bytes_used = qsrs.avg_log_bytes_used, min_log_bytes_used = qsrs.min_log_bytes_used, max_log_bytes_used = qsrs.max_log_bytes_used,"
+            : "avg_log_bytes_used = NULL, min_log_bytes_used = NULL, max_log_bytes_used = NULL,";
+
+        string tempdbCols = isNew
+            ? "avg_tempdb_space_used = qsrs.avg_tempdb_space_used, min_tempdb_space_used = qsrs.min_tempdb_space_used, max_tempdb_space_used = qsrs.max_tempdb_space_used,"
+            : "avg_tempdb_space_used = NULL, min_tempdb_space_used = NULL, max_tempdb_space_used = NULL,";
+
+        string planForcingCol = isNew
+            ? "plan_forcing_type = qsp.plan_forcing_type_desc,"
+            : "plan_forcing_type = NULL,";
+
+        string planTypeCol = hasPlanType
+            ? "plan_type = qsp.plan_type_desc,"
+            : "plan_type = NULL,";
+
         var duckSw = new Stopwatch();
 
         using (var duckConnection = _duckDb.CreateConnection())
@@ -84,23 +181,64 @@ ORDER BY d.name
             {
                 try
                 {
+                    var escapedDbName = dbName.Replace("]", "]]");
                     var qsQuery = $@"
-EXECUTE [{dbName.Replace("]", "]]")}].sys.sp_executesql
+EXECUTE [{escapedDbName}].sys.sp_executesql
     N'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-     SELECT
+     SELECT /* PerformanceMonitorLite */
          query_id = qsq.query_id,
          plan_id = qsp.plan_id,
-         query_text = qst.query_sql_text,
-         query_hash = CONVERT(varchar(64), qsq.query_hash, 1),
-         execution_count = qsrs.count_executions,
-         avg_duration_ms = CONVERT(decimal(18,2), qsrs.avg_duration / 1000.0),
-         avg_cpu_time_ms = CONVERT(decimal(18,2), qsrs.avg_cpu_time / 1000.0),
-         avg_logical_reads = CONVERT(decimal(18,2), qsrs.avg_logical_io_reads),
-         avg_logical_writes = CONVERT(decimal(18,2), qsrs.avg_logical_io_writes),
-         avg_physical_reads = CONVERT(decimal(18,2), qsrs.avg_physical_io_reads),
-         avg_rowcount = CONVERT(decimal(18,2), qsrs.avg_rowcount),
+         execution_type_desc = qsrs.execution_type_desc,
+         first_execution_time = qsrs.first_execution_time,
          last_execution_time = qsrs.last_execution_time,
+         module_name =
+             CASE
+                 WHEN qsq.object_id = 0
+                 THEN N''Adhoc''
+                 ELSE COALESCE(
+                     OBJECT_SCHEMA_NAME(qsq.object_id) + N''.'' + OBJECT_NAME(qsq.object_id),
+                     N''Unknown'')
+             END,
+         query_sql_text = qst.query_sql_text,
+         query_hash = CONVERT(varchar(64), qsq.query_hash, 1),
+         count_executions = qsrs.count_executions,
+         avg_duration = qsrs.avg_duration,
+         min_duration = qsrs.min_duration,
+         max_duration = qsrs.max_duration,
+         avg_cpu_time = qsrs.avg_cpu_time,
+         min_cpu_time = qsrs.min_cpu_time,
+         max_cpu_time = qsrs.max_cpu_time,
+         avg_logical_io_reads = qsrs.avg_logical_io_reads,
+         min_logical_io_reads = qsrs.min_logical_io_reads,
+         max_logical_io_reads = qsrs.max_logical_io_reads,
+         avg_logical_io_writes = qsrs.avg_logical_io_writes,
+         min_logical_io_writes = qsrs.min_logical_io_writes,
+         max_logical_io_writes = qsrs.max_logical_io_writes,
+         avg_physical_io_reads = qsrs.avg_physical_io_reads,
+         min_physical_io_reads = qsrs.min_physical_io_reads,
+         max_physical_io_reads = qsrs.max_physical_io_reads,
+         avg_clr_time = qsrs.avg_clr_time,
+         min_clr_time = qsrs.min_clr_time,
+         max_clr_time = qsrs.max_clr_time,
+         min_dop = qsrs.min_dop,
+         max_dop = qsrs.max_dop,
+         avg_query_max_used_memory = qsrs.avg_query_max_used_memory,
+         min_query_max_used_memory = qsrs.min_query_max_used_memory,
+         max_query_max_used_memory = qsrs.max_query_max_used_memory,
+         avg_rowcount = qsrs.avg_rowcount,
+         min_rowcount = qsrs.min_rowcount,
+         max_rowcount = qsrs.max_rowcount,
+         {numPhysIoReadsCols}
+         {logBytesCols}
+         {tempdbCols}
+         {planTypeCol}
+         {planForcingCol}
+         is_forced_plan = qsp.is_forced_plan,
+         force_failure_count = qsp.force_failure_count,
+         last_force_failure_reason = qsp.last_force_failure_reason_desc,
+         compatibility_level = qsp.compatibility_level,
+         query_plan_text = CONVERT(nvarchar(max), qsp.query_plan),
          query_plan_hash = CONVERT(varchar(64), qsp.query_plan_hash, 1)
      FROM sys.query_store_runtime_stats AS qsrs
      JOIN sys.query_store_plan AS qsp
@@ -110,6 +248,7 @@ JOIN sys.query_store_query AS qsq
      JOIN sys.query_store_query_text AS qst
        ON qst.query_text_id = qsq.query_text_id
      WHERE qsrs.last_execution_time > @cutoff_time
+     AND   qst.query_sql_text NOT LIKE N''%PerformanceMonitorLite%''
      OPTION(RECOMPILE);',
     N'@cutoff_time datetime2(7)',
     @cutoff_time;";
@@ -128,25 +267,84 @@ WHERE qsrs.last_execution_time > @cutoff_time
                     {
                         while (await reader.ReadAsync(cancellationToken))
                         {
+                            /* Reader ordinals match SELECT column order:
+                               0=query_id, 1=plan_id, 2=execution_type_desc,
+                               3=first_execution_time (dto), 4=last_execution_time (dto),
+                               5=module_name, 6=query_sql_text, 7=query_hash, 8=count_executions,
+                               9=avg_duration, 10=min_duration, 11=max_duration,
+                               12=avg_cpu_time, 13=min_cpu_time, 14=max_cpu_time,
+                               15=avg_logical_io_reads, 16=min_logical_io_reads, 17=max_logical_io_reads,
+                               18=avg_logical_io_writes, 19=min_logical_io_writes, 20=max_logical_io_writes,
+                               21=avg_physical_io_reads, 22=min_physical_io_reads, 23=max_physical_io_reads,
+                               24=avg_clr_time, 25=min_clr_time, 26=max_clr_time,
+                               27=min_dop, 28=max_dop,
+                               29=avg_query_max_used_memory, 30=min_query_max_used_memory, 31=max_query_max_used_memory,
+                               32=avg_rowcount, 33=min_rowcount, 34=max_rowcount,
+                               35=avg_num_physical_io_reads, 36=min_num_physical_io_reads, 37=max_num_physical_io_reads,
+                               38=avg_log_bytes_used, 39=min_log_bytes_used, 40=max_log_bytes_used,
+                               41=avg_tempdb_space_used, 42=min_tempdb_space_used, 43=max_tempdb_space_used,
+                               44=plan_type, 45=plan_forcing_type,
+                               46=is_forced_plan, 47=force_failure_count, 48=last_force_failure_reason,
+                               49=compatibility_level, 50=query_plan_text, 51=query_plan_hash */
+
                             var row = appender.CreateRow();
-                            row.AppendValue(GenerateCollectionId())
-                               .AppendValue(collectionTime)
-                               .AppendValue(serverId)
-                               .AppendValue(server.ServerName)
-                               .AppendValue(dbName)
-                               .AppendValue(reader.GetInt64(0))                                                         /* query_id */
-                               .AppendValue(reader.GetInt64(1))                                                         /* plan_id */
-                               .AppendValue(reader.IsDBNull(2) ? (string?)null : reader.GetString(2))                   /* query_text */
-                               .AppendValue(reader.IsDBNull(3) ? (string?)null : reader.GetString(3))                   /* query_hash */
-                               .AppendValue(reader.GetInt64(4))                                                         /* execution_count */
-                               .AppendValue(reader.IsDBNull(5) ? 0m : reader.GetDecimal(5))                              /* avg_duration_ms */
-                               .AppendValue(reader.IsDBNull(6) ? 0m : reader.GetDecimal(6))                              /* avg_cpu_time_ms */
-                               .AppendValue(reader.IsDBNull(7) ? 0m : reader.GetDecimal(7))                              /* avg_logical_reads */
-                               .AppendValue(reader.IsDBNull(8) ? 0m : reader.GetDecimal(8))                              /* avg_logical_writes */
-                               .AppendValue(reader.IsDBNull(9) ? 0m : reader.GetDecimal(9))                              /* avg_physical_reads */
-                               .AppendValue(reader.IsDBNull(10) ? 0m : reader.GetDecimal(10))                            /* avg_rowcount */
-                               .AppendValue(reader.IsDBNull(11) ? (DateTime?)null : ((DateTimeOffset)reader.GetValue(11)).UtcDateTime)
-                               .AppendValue(reader.IsDBNull(12) ? (string?)null : reader.GetString(12))
+                            row.AppendValue(GenerateCollectionId())                                                             /* collection_id */
+                               .AppendValue(collectionTime)                                                                     /* collection_time */
+                               .AppendValue(serverId)                                                                           /* server_id */
+                               .AppendValue(server.ServerName)                                                                  /* server_name */
+                               .AppendValue(dbName)                                                                             /* database_name */
+                               .AppendValue(reader.GetInt64(0))                                                                 /* query_id */
+                               .AppendValue(reader.GetInt64(1))                                                                 /* plan_id */
+                               .AppendValue(reader.IsDBNull(2) ? (string?)null : reader.GetString(2))                           /* execution_type_desc */
+                               .AppendValue(reader.IsDBNull(3) ? (DateTime?)null : ((DateTimeOffset)reader.GetValue(3)).UtcDateTime) /* first_execution_time */
+                               .AppendValue(reader.IsDBNull(4) ? (DateTime?)null : ((DateTimeOffset)reader.GetValue(4)).UtcDateTime) /* last_execution_time */
+                               .AppendValue(reader.IsDBNull(5) ? (string?)null : reader.GetString(5))                           /* module_name */
+                               .AppendValue(reader.IsDBNull(6) ? (string?)null : reader.GetString(6))                           /* query_text */
+                               .AppendValue(reader.IsDBNull(7) ? (string?)null : reader.GetString(7))                           /* query_hash */
+                               .AppendValue(reader.GetInt64(8))                                                                 /* execution_count */
+                               .AppendValue(ReadNullableInt64(reader, 9))                                                       /* avg_duration_us */
+                               .AppendValue(ReadNullableInt64(reader, 10))                                                      /* min_duration_us */
+                               .AppendValue(ReadNullableInt64(reader, 11))                                                      /* max_duration_us */
+                               .AppendValue(ReadNullableInt64(reader, 12))                                                      /* avg_cpu_time_us */
+                               .AppendValue(ReadNullableInt64(reader, 13))                                                      /* min_cpu_time_us */
+                               .AppendValue(ReadNullableInt64(reader, 14))                                                      /* max_cpu_time_us */
+                               .AppendValue(ReadNullableInt64(reader, 15))                                                      /* avg_logical_io_reads */
+                               .AppendValue(ReadNullableInt64(reader, 16))                                                      /* min_logical_io_reads */
+                               .AppendValue(ReadNullableInt64(reader, 17))                                                      /* max_logical_io_reads */
+                               .AppendValue(ReadNullableInt64(reader, 18))                                                      /* avg_logical_io_writes */
+                               .AppendValue(ReadNullableInt64(reader, 19))                                                      /* min_logical_io_writes */
+                               .AppendValue(ReadNullableInt64(reader, 20))                                                      /* max_logical_io_writes */
+                               .AppendValue(ReadNullableInt64(reader, 21))                                                      /* avg_physical_io_reads */
+                               .AppendValue(ReadNullableInt64(reader, 22))                                                      /* min_physical_io_reads */
+                               .AppendValue(ReadNullableInt64(reader, 23))                                                      /* max_physical_io_reads */
+                               .AppendValue(ReadNullableInt64(reader, 24))                                                      /* avg_clr_time_us */
+                               .AppendValue(ReadNullableInt64(reader, 25))                                                      /* min_clr_time_us */
+                               .AppendValue(ReadNullableInt64(reader, 26))                                                      /* max_clr_time_us */
+                               .AppendValue(ReadNullableInt64(reader, 27))                                                      /* min_dop */
+                               .AppendValue(ReadNullableInt64(reader, 28))                                                      /* max_dop */
+                               .AppendValue(ReadNullableInt64(reader, 29))                                                      /* avg_query_max_used_memory */
+                               .AppendValue(ReadNullableInt64(reader, 30))                                                      /* min_query_max_used_memory */
+                               .AppendValue(ReadNullableInt64(reader, 31))                                                      /* max_query_max_used_memory */
+                               .AppendValue(ReadNullableInt64(reader, 32))                                                      /* avg_rowcount */
+                               .AppendValue(ReadNullableInt64(reader, 33))                                                      /* min_rowcount */
+                               .AppendValue(ReadNullableInt64(reader, 34))                                                      /* max_rowcount */
+                               .AppendValue(ReadNullableInt64(reader, 35))                                                      /* avg_num_physical_io_reads (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 36))                                                      /* min_num_physical_io_reads (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 37))                                                      /* max_num_physical_io_reads (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 38))                                                      /* avg_log_bytes_used (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 39))                                                      /* min_log_bytes_used (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 40))                                                      /* max_log_bytes_used (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 41))                                                      /* avg_tempdb_space_used (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 42))                                                      /* min_tempdb_space_used (2017+) */
+                               .AppendValue(ReadNullableInt64(reader, 43))                                                      /* max_tempdb_space_used (2017+) */
+                               .AppendValue(reader.IsDBNull(44) ? (string?)null : reader.GetString(44))                         /* plan_type (2022+) */
+                               .AppendValue(reader.IsDBNull(45) ? (string?)null : reader.GetString(45))                         /* plan_forcing_type (2017+) */
+                               .AppendValue(!reader.IsDBNull(46) && reader.GetBoolean(46))                                      /* is_forced_plan */
+                               .AppendValue(reader.IsDBNull(47) ? 0L : reader.GetInt64(47))                                     /* force_failure_count */
+                               .AppendValue(reader.IsDBNull(48) ? (string?)null : reader.GetString(48))                         /* last_force_failure_reason */
+                               .AppendValue(reader.IsDBNull(49) ? 0 : Convert.ToInt32(reader.GetValue(49)))                     /* compatibility_level */
+                               .AppendValue(reader.IsDBNull(50) ? (string?)null : reader.GetString(50))                         /* query_plan_text */
+                               .AppendValue(reader.IsDBNull(51) ? (string?)null : reader.GetString(51))                         /* query_plan_hash */
                                .EndRow();
 
                             totalRows++;
@@ -172,4 +370,24 @@ WHERE qsrs.last_execution_time > @cutoff_time
             totalRows, databases.Count, server.DisplayName);
         return totalRows;
     }
+
+    /// <summary>
+    /// Helper to read a nullable int64 from a SqlDataReader, converting float/decimal Query Store values to long.
+    /// Query Store runtime_stats columns are stored as float in the catalog but represent integer-scale values.
+    /// </summary>
+    private static long ReadNullableInt64(SqlDataReader reader, int ordinal)
+    {
+        if (reader.IsDBNull(ordinal)) return 0L;
+        var value = reader.GetValue(ordinal);
+        return value switch
+        {
+            long l => l,
+            int i => i,
+            short s => s,
+            decimal d => (long)d,
+            double dbl => (long)dbl,
+            float f => (long)f,
+            _ => Convert.ToInt64(value)
+        };
+    }
 }
diff --git a/Lite/Services/RemoteCollectorService.TempDb.cs b/Lite/Services/RemoteCollectorService.TempDb.cs
index ef0a300d..1f600121 100644
--- a/Lite/Services/RemoteCollectorService.TempDb.cs
+++ b/Lite/Services/RemoteCollectorService.TempDb.cs
@@ -27,20 +27,22 @@ private async Task<int> CollectTempDbStatsAsync(ServerConnection server, Cancell
         const string query = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     user_object_reserved_mb = CONVERT(decimal(18,2), SUM(dsu.user_object_reserved_page_count) * 8 / 1024.0),
     internal_object_reserved_mb = CONVERT(decimal(18,2), SUM(dsu.internal_object_reserved_page_count) * 8 / 1024.0),
     version_store_reserved_mb = CONVERT(decimal(18,2), SUM(dsu.version_store_reserved_page_count) * 8 / 1024.0),
     total_reserved_mb = CONVERT(decimal(18,2), SUM(dsu.user_object_reserved_page_count + dsu.internal_object_reserved_page_count + dsu.version_store_reserved_page_count) * 8 / 1024.0),
     unallocated_mb = CONVERT(decimal(18,2), SUM(dsu.unallocated_extent_page_count) * 8 / 1024.0)
-FROM tempdb.sys.dm_db_file_space_usage AS dsu;
+FROM tempdb.sys.dm_db_file_space_usage AS dsu
+OPTION(RECOMPILE);
 
-SELECT TOP (1)
+SELECT /* PerformanceMonitorLite */ TOP (1)
     session_id = ssu.session_id,
     tempdb_mb = CONVERT(decimal(18,2), (ssu.user_objects_alloc_page_count + ssu.internal_objects_alloc_page_count) * 8 / 1024.0),
     total_sessions = (SELECT COUNT_BIG(*) FROM sys.dm_db_session_space_usage WHERE user_objects_alloc_page_count + internal_objects_alloc_page_count > 0)
 FROM sys.dm_db_session_space_usage AS ssu
-ORDER BY (ssu.user_objects_alloc_page_count + ssu.internal_objects_alloc_page_count) DESC;";
+ORDER BY (ssu.user_objects_alloc_page_count + ssu.internal_objects_alloc_page_count) DESC
+OPTION(RECOMPILE);";
 
         var serverId = GetServerId(server);
         var collectionTime = DateTime.UtcNow;
diff --git a/Lite/Services/RemoteCollectorService.WaitStats.cs b/Lite/Services/RemoteCollectorService.WaitStats.cs
index 52767e7f..2ba17854 100644
--- a/Lite/Services/RemoteCollectorService.WaitStats.cs
+++ b/Lite/Services/RemoteCollectorService.WaitStats.cs
@@ -22,19 +22,15 @@ namespace PerformanceMonitorLite.Services;
 
 public partial class RemoteCollectorService
 {
-    private HashSet<string>? _ignoredWaitTypes;
+    private readonly Lazy<HashSet<string>> _ignoredWaitTypes;
 
     /// <summary>
-    /// Gets the set of wait types to ignore during collection.
+    /// Loads the set of wait types to ignore during collection.
+    /// Thread-safe via Lazy&lt;T&gt; (multiple server tasks call this in parallel).
     /// </summary>
-    private HashSet<string> GetIgnoredWaitTypes()
+    private HashSet<string> LoadIgnoredWaitTypes()
     {
-        if (_ignoredWaitTypes != null)
-        {
-            return _ignoredWaitTypes;
-        }
-
-        _ignoredWaitTypes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var waits = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         var configPath = Path.Combine(App.ConfigDirectory, "ignored_wait_types.json");
         if (File.Exists(configPath))
@@ -51,7 +47,7 @@ private HashSet<string> GetIgnoredWaitTypes()
                         var waitType = wait.GetString();
                         if (!string.IsNullOrEmpty(waitType))
                         {
-                            _ignoredWaitTypes.Add(waitType);
+                            waits.Add(waitType);
                         }
                     }
                 }
@@ -62,7 +58,7 @@ private HashSet<string> GetIgnoredWaitTypes()
             }
         }
 
-        return _ignoredWaitTypes;
+        return waits;
     }
 
     /// <summary>
@@ -82,7 +78,7 @@ FROM sys.dm_os_wait_stats AS ws
 WHERE ws.wait_time_ms > 0
 OPTION(RECOMPILE);";
 
-        var ignoredWaits = GetIgnoredWaitTypes();
+        var ignoredWaits = _ignoredWaitTypes.Value;
         var serverId = GetServerId(server);
         var collectionTime = DateTime.UtcNow;
         var rowsCollected = 0;
diff --git a/Lite/Services/RemoteCollectorService.WaitingTasks.cs b/Lite/Services/RemoteCollectorService.WaitingTasks.cs
index 888811e0..e3b31f70 100644
--- a/Lite/Services/RemoteCollectorService.WaitingTasks.cs
+++ b/Lite/Services/RemoteCollectorService.WaitingTasks.cs
@@ -27,12 +27,11 @@ private async Task<int> CollectWaitingTasksAsync(ServerConnection server, Cancel
         const string query = @"
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-SELECT
+SELECT /* PerformanceMonitorLite */
     session_id = wt.session_id,
     wait_type = wt.wait_type,
     wait_duration_ms = wt.wait_duration_ms,
     blocking_session_id = wt.blocking_session_id,
-    resource_description = wt.resource_description,
     database_name = DB_NAME(er.database_id)
 FROM sys.dm_os_waiting_tasks AS wt
 LEFT JOIN sys.dm_exec_requests AS er
@@ -73,8 +72,7 @@ AND   wt.wait_type IS NOT NULL
                     var waitType = reader.IsDBNull(1) ? null : reader.GetString(1);
                     var waitDurationMs = reader.IsDBNull(2) ? 0L : reader.GetInt64(2);
                     var blockingSessionId = reader.IsDBNull(3) ? (short?)null : reader.GetInt16(3);
-                    var resourceDescription = reader.IsDBNull(4) ? null : reader.GetString(4);
-                    var databaseName = reader.IsDBNull(5) ? null : reader.GetString(5);
+                    var databaseName = reader.IsDBNull(4) ? null : reader.GetString(4);
 
                     var row = appender.CreateRow();
                     row.AppendValue(GenerateCollectionId())
@@ -85,7 +83,7 @@ AND   wt.wait_type IS NOT NULL
                        .AppendValue(waitType)
                        .AppendValue(waitDurationMs)
                        .AppendValue(blockingSessionId.HasValue ? (int?)blockingSessionId.Value : null)
-                       .AppendValue(resourceDescription)
+                       .AppendValue((string?)null) /* resource_description — no longer collected */
                        .AppendValue(databaseName)
                        .EndRow();
 
diff --git a/Lite/Services/RemoteCollectorService.cs b/Lite/Services/RemoteCollectorService.cs
index b2d9ad39..10eb30c2 100644
--- a/Lite/Services/RemoteCollectorService.cs
+++ b/Lite/Services/RemoteCollectorService.cs
@@ -78,9 +78,9 @@ public partial class RemoteCollectorService
     private const int CommandTimeoutSeconds = 30;
 
     /// <summary>
-    /// Connection timeout for SQL Server connections in seconds.
+    /// Connection timeout for SQL Server connections in seconds. Read from App settings each call.
     /// </summary>
-    private const int ConnectionTimeoutSeconds = 5;
+    private static int ConnectionTimeoutSeconds => App.ConnectionTimeoutSeconds;
 
     /// <summary>
     /// Per-call timing fields set by each collector method.
@@ -112,6 +112,7 @@ public RemoteCollectorService(
         _scheduleManager = scheduleManager;
         _logger = logger;
         _deltaCalculator = new DeltaCalculator(logger);
+        _ignoredWaitTypes = new Lazy<HashSet<string>>(LoadIgnoredWaitTypes);
     }
 
     /// <summary>
@@ -239,10 +240,11 @@ public async Task RunDueCollectorsAsync(CancellationToken cancellationToken = de
         await Task.WhenAll(serverTasks);
 
         /* Run CHECKPOINT here after all collector connections are closed.
-           This avoids opening a separate DuckDB instance that could conflict
-           with concurrent UI connections via OS file locks. */
+           Write lock ensures no UI readers have stale file offsets when
+           CHECKPOINT reorganizes/truncates the database file. */
         try
         {
+            using var writeLock = _duckDb.AcquireWriteLock();
             using var conn = _duckDb.CreateConnection();
             await conn.OpenAsync(cancellationToken);
             using var cmd = conn.CreateCommand();
diff --git a/Lite/Services/ReproScriptBuilder.cs b/Lite/Services/ReproScriptBuilder.cs
index ddf7f72a..6a9a35a9 100644
--- a/Lite/Services/ReproScriptBuilder.cs
+++ b/Lite/Services/ReproScriptBuilder.cs
@@ -29,7 +29,8 @@ public static string BuildReproScript(
         string? databaseName,
         string? planXml,
         string? isolationLevel,
-        string source = "Query")
+        string source = "Query",
+        bool isAzureSqlDb = false)
     {
         var sb = new StringBuilder();
         var warnings = new List<string>();
@@ -94,19 +95,30 @@ public static string BuildReproScript(
         sb.AppendLine("*/");
         sb.AppendLine();
 
-        /* USE database */
-        if (!string.IsNullOrEmpty(databaseName))
+        /* USE database (skip for Azure SQL DB — USE is invalid there) */
+        if (!string.IsNullOrEmpty(databaseName) && !isAzureSqlDb)
         {
             sb.AppendLine($"USE [{databaseName}];");
             sb.AppendLine();
         }
 
-        /* SET options */
+        /* SET options from plan XML (match the query's original execution context) */
+        if (!string.IsNullOrEmpty(planXml))
+        {
+            var setOptions = ExtractSetOptionsFromPlan(planXml);
+            if (setOptions.Count > 0)
+            {
+                foreach (var setOption in setOptions)
+                {
+                    sb.AppendLine(setOption);
+                }
+            }
+        }
+
         if (!string.IsNullOrEmpty(isolationLevel))
         {
             sb.AppendLine($"SET TRANSACTION ISOLATION LEVEL {isolationLevel.ToUpperInvariant()};");
         }
-        sb.AppendLine("SET STATISTICS XML OFF;");
         sb.AppendLine("SET NOCOUNT ON;");
         sb.AppendLine();
 
@@ -257,6 +269,52 @@ public static List<QueryParameter> ExtractParametersFromPlan(string planXml)
         return parameters;
     }
 
+    /// <summary>
+    /// Extracts StatementSetOptions from plan XML and returns ordered SET statements.
+    /// These match the execution context the query was originally compiled under.
+    /// </summary>
+    private static List<string> ExtractSetOptionsFromPlan(string planXml)
+    {
+        var setStatements = new List<string>();
+
+        try
+        {
+            var doc = XDocument.Parse(planXml);
+            XNamespace ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
+
+            var setOptsEl = doc.Descendants(ns + "StatementSetOptions").FirstOrDefault();
+            if (setOptsEl == null) return setStatements;
+
+            /* Emit in conventional order matching SSMS/plan explorer output */
+            var options = new (string Attribute, string SetName)[]
+            {
+                ("ANSI_NULLS", "ANSI_NULLS"),
+                ("ANSI_PADDING", "ANSI_PADDING"),
+                ("ANSI_WARNINGS", "ANSI_WARNINGS"),
+                ("ARITHABORT", "ARITHABORT"),
+                ("CONCAT_NULL_YIELDS_NULL", "CONCAT_NULL_YIELDS_NULL"),
+                ("QUOTED_IDENTIFIER", "QUOTED_IDENTIFIER"),
+                ("NUMERIC_ROUNDABORT", "NUMERIC_ROUNDABORT"),
+            };
+
+            foreach (var (attr, setName) in options)
+            {
+                var value = setOptsEl.Attribute(attr)?.Value;
+                if (value != null)
+                {
+                    var onOff = value is "true" or "1" ? "ON" : "OFF";
+                    setStatements.Add($"SET {setName} {onOff};");
+                }
+            }
+        }
+        catch
+        {
+            /* Plan XML parse failure — return empty list, SET options are best-effort */
+        }
+
+        return setStatements;
+    }
+
     /// <summary>
     /// Strips the parameter declaration prefix from query text captured via sp_executesql.
     /// Query text like "(@p1 int, @p2 nvarchar(50))SELECT ..." becomes "SELECT ...".
diff --git a/Lite/Services/RetentionService.cs b/Lite/Services/RetentionService.cs
index 12ba612f..743c8346 100644
--- a/Lite/Services/RetentionService.cs
+++ b/Lite/Services/RetentionService.cs
@@ -29,7 +29,9 @@ public RetentionService(string archivePath, ILogger<RetentionService>? logger =
 
     /// <summary>
     /// Deletes Parquet files older than the specified retention period.
-    /// Files are named like "2025-01_wait_stats.parquet" where the prefix is the archive month.
+    /// Supports two naming formats:
+    ///   - Timestamped: "20260221_1328_wait_stats.parquet" (yyyyMMdd prefix)
+    ///   - Legacy monthly: "2026-02_wait_stats.parquet" (yyyy-MM prefix)
     /// </summary>
     public void CleanupOldArchives(int retentionDays = 90)
     {
@@ -45,8 +47,24 @@ public void CleanupOldArchives(int retentionDays = 90)
             try
             {
                 var fileName = Path.GetFileNameWithoutExtension(file);
-                /* Parse month from filename: "2025-01_wait_stats" -> "2025-01" */
-                if (fileName.Length >= 7 &&
+
+                /* Try timestamped format first: "20260221_1328_wait_stats" -> "20260221" */
+                if (fileName.Length >= 8 &&
+                    DateTime.TryParseExact(
+                        fileName[..8],
+                        "yyyyMMdd",
+                        CultureInfo.InvariantCulture,
+                        DateTimeStyles.None,
+                        out var fileDate))
+                {
+                    if (fileDate < cutoffDate)
+                    {
+                        File.Delete(file);
+                        _logger?.LogInformation("Deleted expired archive: {File}", file);
+                    }
+                }
+                /* Fall back to legacy monthly format: "2026-02_wait_stats" -> "2026-02" */
+                else if (fileName.Length >= 7 &&
                     DateTime.TryParseExact(
                         fileName[..7],
                         "yyyy-MM",
diff --git a/Lite/Services/ServerManager.cs b/Lite/Services/ServerManager.cs
index 2363ae62..a007c2bb 100644
--- a/Lite/Services/ServerManager.cs
+++ b/Lite/Services/ServerManager.cs
@@ -31,9 +31,9 @@ public class ServerManager
     private readonly ConcurrentDictionary<string, ServerConnectionStatus> _connectionStatuses;
 
     /// <summary>
-    /// Timeout in seconds for connectivity checks. Kept short to avoid blocking UI.
+    /// Timeout in seconds for connectivity checks. Read from App settings each call.
     /// </summary>
-    private const int ConnectionCheckTimeoutSeconds = 5;
+    private static int ConnectionCheckTimeoutSeconds => App.ConnectionTimeoutSeconds;
 
     public ServerManager(string configDirectory, ILogger<ServerManager>? logger = null)
     {
diff --git a/Lite/Services/ShowPlanParser.cs b/Lite/Services/ShowPlanParser.cs
new file mode 100644
index 00000000..7cea60ef
--- /dev/null
+++ b/Lite/Services/ShowPlanParser.cs
@@ -0,0 +1,1602 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml.Linq;
+using PerformanceMonitorLite.Models;
+
+namespace PerformanceMonitorLite.Services;
+
+public static class ShowPlanParser
+{
+    private static readonly XNamespace Ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
+
+    public static ParsedPlan Parse(string xml)
+    {
+        var plan = new ParsedPlan { RawXml = xml };
+
+        XDocument doc;
+        try
+        {
+            doc = XDocument.Parse(xml);
+        }
+        catch
+        {
+            return plan;
+        }
+
+        var root = doc.Root;
+        if (root == null) return plan;
+
+        plan.BuildVersion = root.Attribute("Version")?.Value;
+        plan.Build = root.Attribute("Build")?.Value;
+        plan.ClusteredMode = root.Attribute("ClusteredMode")?.Value is "true" or "1";
+
+        // Standard path: ShowPlanXML → BatchSequence → Batch → Statements
+        var batches = root.Descendants(Ns + "Batch");
+        foreach (var batchEl in batches)
+        {
+            var batch = new PlanBatch();
+            var statementsEl = batchEl.Element(Ns + "Statements");
+            if (statementsEl != null)
+            {
+                foreach (var stmtEl in statementsEl.Elements())
+                {
+                    var stmts = ParseStatementAndChildren(stmtEl);
+                    batch.Statements.AddRange(stmts);
+                }
+            }
+            if (batch.Statements.Count > 0)
+                plan.Batches.Add(batch);
+        }
+
+        // Fallback: some plan XML has StmtSimple directly under QueryPlan
+        if (plan.Batches.Count == 0)
+        {
+            var batch = new PlanBatch();
+            foreach (var stmtEl in root.Descendants(Ns + "StmtSimple"))
+            {
+                var stmt = ParseStatement(stmtEl);
+                if (stmt != null)
+                    batch.Statements.Add(stmt);
+            }
+            if (batch.Statements.Count > 0)
+                plan.Batches.Add(batch);
+        }
+
+        ComputeOperatorCosts(plan);
+        return plan;
+    }
+
+    /// <summary>
+    /// Handles StmtSimple, StmtCond (IF/ELSE), and StmtCursor recursively.
+    /// Returns a flat list of all parseable statements found.
+    /// </summary>
+    private static List<PlanStatement> ParseStatementAndChildren(XElement stmtEl)
+    {
+        var results = new List<PlanStatement>();
+        var localName = stmtEl.Name.LocalName;
+
+        if (localName == "StmtCond")
+        {
+            // IF/ELSE blocks — recurse into Condition, Then, Else
+            var condEl = stmtEl.Element(Ns + "Condition");
+            if (condEl != null)
+            {
+                foreach (var child in condEl.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+
+            var thenStmts = stmtEl.Element(Ns + "Then")?.Element(Ns + "Statements");
+            if (thenStmts != null)
+            {
+                foreach (var child in thenStmts.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+
+            var elseStmts = stmtEl.Element(Ns + "Else")?.Element(Ns + "Statements");
+            if (elseStmts != null)
+            {
+                foreach (var child in elseStmts.Elements())
+                    results.AddRange(ParseStatementAndChildren(child));
+            }
+        }
+        else if (localName == "StmtCursor")
+        {
+            // Cursor plans — parse each Operation's QueryPlan
+            var cursorPlanEl = stmtEl.Element(Ns + "CursorPlan");
+            if (cursorPlanEl != null)
+            {
+                var cursorName = cursorPlanEl.Attribute("CursorName")?.Value;
+                var cursorActualType = cursorPlanEl.Attribute("CursorActualType")?.Value;
+                var cursorRequestedType = cursorPlanEl.Attribute("CursorRequestedType")?.Value;
+                var cursorConcurrency = cursorPlanEl.Attribute("CursorConcurrency")?.Value;
+                var cursorForwardOnly = cursorPlanEl.Attribute("ForwardOnly")?.Value is "true" or "1";
+
+                foreach (var opEl in cursorPlanEl.Elements(Ns + "Operation"))
+                {
+                    var opType = opEl.Attribute("OperationType")?.Value ?? "CursorOp";
+                    var qpEl = opEl.Element(Ns + "QueryPlan");
+                    if (qpEl == null) continue;
+
+                    // Build a synthetic StmtSimple-like wrapper for ParseStatement
+                    var relOpEl = qpEl.Element(Ns + "RelOp");
+                    if (relOpEl == null) continue;
+
+                    var stmt = ParseQueryPlanAsStatement(stmtEl, qpEl, relOpEl);
+                    if (stmt != null)
+                    {
+                        // Override statement text with cursor context
+                        if (string.IsNullOrEmpty(stmt.StatementText))
+                            stmt.StatementText = $"Cursor: {cursorName} ({opType})";
+                        stmt.CursorName = cursorName;
+                        stmt.CursorActualType = cursorActualType;
+                        stmt.CursorRequestedType = cursorRequestedType;
+                        stmt.CursorConcurrency = cursorConcurrency;
+                        stmt.CursorForwardOnly = cursorForwardOnly;
+                        results.Add(stmt);
+                    }
+                }
+            }
+        }
+        else
+        {
+            // StmtSimple or any other statement type
+            var stmt = ParseStatement(stmtEl);
+            if (stmt != null)
+                results.Add(stmt);
+        }
+
+        return results;
+    }
+
+    private static PlanStatement? ParseStatement(XElement stmtEl)
+    {
+        var stmt = new PlanStatement
+        {
+            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
+            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "",
+            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value),
+            StatementEstRows = ParseDouble(stmtEl.Attribute("StatementEstRows")?.Value)
+        };
+
+        var queryPlanEl = stmtEl.Element(Ns + "QueryPlan");
+
+        // XSD gap: Dispatcher/PSP (on StmtSimple, not inside QueryPlan)
+        var dispatcherEl = stmtEl.Element(Ns + "Dispatcher");
+        if (dispatcherEl != null)
+        {
+            stmt.Dispatcher = new DispatcherInfo();
+            foreach (var pspEl in dispatcherEl.Elements(Ns + "ParameterSensitivePredicate"))
+            {
+                var psp = new ParameterSensitivePredicateInfo
+                {
+                    LowBoundary = ParseDouble(pspEl.Attribute("LowBoundary")?.Value),
+                    HighBoundary = ParseDouble(pspEl.Attribute("HighBoundary")?.Value)
+                };
+                var predEl = pspEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                psp.PredicateText = predEl?.Attribute("ScalarString")?.Value;
+                foreach (var statEl in pspEl.Elements(Ns + "StatisticsInfo"))
+                {
+                    psp.Statistics.Add(new OptimizerStatsUsageItem
+                    {
+                        StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                        TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                        DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
+                        SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
+                        ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
+                        SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
+                        LastUpdate = statEl.Attribute("LastUpdate")?.Value
+                    });
+                }
+                stmt.Dispatcher.ParameterSensitivePredicates.Add(psp);
+            }
+            foreach (var oppEl in dispatcherEl.Elements(Ns + "OptionalParameterPredicate"))
+            {
+                var opp = new OptionalParameterPredicateInfo();
+                var oppPredEl = oppEl.Element(Ns + "Predicate")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                opp.PredicateText = oppPredEl?.Attribute("ScalarString")?.Value;
+                stmt.Dispatcher.OptionalParameterPredicates.Add(opp);
+            }
+        }
+
+        if (queryPlanEl == null) return stmt;
+
+        ParseStmtAttributes(stmt, stmtEl);
+        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
+
+        // Root RelOp — wrap in a synthetic statement-type node (SELECT, INSERT, etc.)
+        var relOpEl = queryPlanEl.Element(Ns + "RelOp");
+        if (relOpEl != null)
+        {
+            var opNode = ParseRelOp(relOpEl);
+            var stmtType = stmt.StatementType.Length > 0
+                ? stmt.StatementType.ToUpperInvariant()
+                : "QUERY";
+
+            var stmtNode = new PlanNode
+            {
+                NodeId = -1,
+                PhysicalOp = stmtType,
+                LogicalOp = stmtType,
+                EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
+                EstimateRows = stmt.StatementEstRows,
+                IconName = stmtType switch
+                {
+                    "SELECT" => "result",
+                    "INSERT" => "insert",
+                    "UPDATE" => "update",
+                    "DELETE" => "delete",
+                    _ => "language_construct_catch_all"
+                }
+            };
+            opNode.Parent = stmtNode;
+            stmtNode.Children.Add(opNode);
+            stmt.RootNode = stmtNode;
+        }
+
+        // XSD gap: UDF sub-plans
+        foreach (var udfEl in stmtEl.Elements(Ns + "UDF"))
+        {
+            var udfInfo = new FunctionPlanInfo
+            {
+                ProcName = udfEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = udfEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var udfStmts = udfEl.Element(Ns + "Statements");
+            if (udfStmts != null)
+            {
+                foreach (var childStmt in udfStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt);
+                    udfInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.UdfPlans.Add(udfInfo);
+        }
+
+        // XSD gap: StoredProc sub-plan
+        var storedProcEl = stmtEl.Element(Ns + "StoredProc");
+        if (storedProcEl != null)
+        {
+            var spInfo = new FunctionPlanInfo
+            {
+                ProcName = storedProcEl.Attribute("ProcName")?.Value ?? "",
+                IsNativelyCompiled = storedProcEl.Attribute("IsNativelyCompiled")?.Value is "true" or "1"
+            };
+            var spStmts = storedProcEl.Element(Ns + "Statements");
+            if (spStmts != null)
+            {
+                foreach (var childStmt in spStmts.Elements())
+                {
+                    var parsed = ParseStatementAndChildren(childStmt);
+                    spInfo.Statements.AddRange(parsed);
+                }
+            }
+            stmt.StoredProcPlan = spInfo;
+        }
+
+        return stmt;
+    }
+
+    /// <summary>
+    /// Parse a QueryPlan element that comes from a cursor Operation (no parent StmtSimple attributes).
+    /// </summary>
+    private static PlanStatement? ParseQueryPlanAsStatement(XElement stmtEl, XElement queryPlanEl, XElement relOpEl)
+    {
+        var stmt = new PlanStatement
+        {
+            StatementText = stmtEl.Attribute("StatementText")?.Value ?? "",
+            StatementType = stmtEl.Attribute("StatementType")?.Value ?? "SELECT",
+            StatementSubTreeCost = ParseDouble(stmtEl.Attribute("StatementSubTreeCost")?.Value)
+        };
+
+        ParseStmtAttributes(stmt, stmtEl);
+        ParseQueryPlanElements(stmt, stmtEl, queryPlanEl);
+
+        var opNode = ParseRelOp(relOpEl);
+        var stmtType = stmt.StatementType.Length > 0
+            ? stmt.StatementType.ToUpperInvariant()
+            : "QUERY";
+
+        // Use subtree cost from RelOp if statement cost is 0
+        if (stmt.StatementSubTreeCost <= 0)
+            stmt.StatementSubTreeCost = opNode.EstimatedTotalSubtreeCost;
+
+        var stmtNode = new PlanNode
+        {
+            NodeId = -1,
+            PhysicalOp = stmtType,
+            LogicalOp = stmtType,
+            EstimatedTotalSubtreeCost = stmt.StatementSubTreeCost,
+            EstimateRows = stmt.StatementEstRows,
+            IconName = stmtType switch
+            {
+                "SELECT" => "result",
+                "INSERT" => "insert",
+                "UPDATE" => "update",
+                "DELETE" => "delete",
+                _ => "language_construct_catch_all"
+            }
+        };
+        opNode.Parent = stmtNode;
+        stmtNode.Children.Add(opNode);
+        stmt.RootNode = stmtNode;
+
+        return stmt;
+    }
+
+    /// <summary>
+    /// Parse attributes from StmtSimple element.
+    /// </summary>
+    private static void ParseStmtAttributes(PlanStatement stmt, XElement stmtEl)
+    {
+        stmt.StatementOptmLevel = stmtEl.Attribute("StatementOptmLevel")?.Value;
+        stmt.StatementOptmEarlyAbortReason = stmtEl.Attribute("StatementOptmEarlyAbortReason")?.Value;
+        stmt.StatementParameterizationType = (int)ParseDouble(stmtEl.Attribute("StatementParameterizationType")?.Value);
+        stmt.StatementSqlHandle = stmtEl.Attribute("StatementSqlHandle")?.Value;
+        stmt.DatabaseContextSettingsId = ParseLong(stmtEl.Attribute("DatabaseContextSettingsId")?.Value);
+        stmt.ParentObjectId = (int)ParseDouble(stmtEl.Attribute("ParentObjectId")?.Value);
+        stmt.SecurityPolicyApplied = stmtEl.Attribute("SecurityPolicyApplied")?.Value is "true" or "1";
+        stmt.BatchModeOnRowStoreUsed = stmtEl.Attribute("BatchModeOnRowStoreUsed")?.Value is "true" or "1";
+        stmt.QueryHash = stmtEl.Attribute("QueryHash")?.Value;
+        stmt.QueryPlanHash = stmtEl.Attribute("QueryPlanHash")?.Value;
+
+        // Bug fix 1.3: CE version is on StmtSimple per XSD
+        stmt.CardinalityEstimationModelVersion = (int)ParseDouble(stmtEl.Attribute("CardinalityEstimationModelVersion")?.Value);
+
+        // Wave 3.6: Query Store hint attributes
+        stmt.QueryStoreStatementHintId = (int)ParseDouble(stmtEl.Attribute("QueryStoreStatementHintId")?.Value);
+        stmt.QueryStoreStatementHintText = stmtEl.Attribute("QueryStoreStatementHintText")?.Value;
+        stmt.QueryStoreStatementHintSource = stmtEl.Attribute("QueryStoreStatementHintSource")?.Value;
+
+        // XSD gap: Statement-level identifiers and handles
+        stmt.StatementId = (int)ParseDouble(stmtEl.Attribute("StatementId")?.Value);
+        stmt.StatementCompId = (int)ParseDouble(stmtEl.Attribute("StatementCompId")?.Value);
+        stmt.TemplatePlanGuideDB = stmtEl.Attribute("TemplatePlanGuideDB")?.Value;
+        stmt.TemplatePlanGuideName = stmtEl.Attribute("TemplatePlanGuideName")?.Value;
+        stmt.ParameterizedPlanHandle = stmtEl.Attribute("ParameterizedPlanHandle")?.Value;
+        stmt.BatchSqlHandle = stmtEl.Attribute("BatchSqlHandle")?.Value;
+        stmt.ContainsLedgerTables = stmtEl.Attribute("ContainsLedgerTables")?.Value is "true" or "1";
+        stmt.QueryCompilationReplay = (int)ParseDouble(stmtEl.Attribute("QueryCompilationReplay")?.Value);
+    }
+
+    /// <summary>
+    /// Parse child elements of QueryPlan (memory grant, stats, parameters, etc.)
+    /// </summary>
+    private static void ParseQueryPlanElements(PlanStatement stmt, XElement stmtEl, XElement queryPlanEl)
+    {
+        // StatementSetOptions (child element of StmtSimple)
+        var setOptsEl = stmtEl.Element(Ns + "StatementSetOptions");
+        if (setOptsEl != null)
+        {
+            stmt.SetOptions = new SetOptionsInfo
+            {
+                AnsiNulls = setOptsEl.Attribute("ANSI_NULLS")?.Value is "true" or "1",
+                AnsiPadding = setOptsEl.Attribute("ANSI_PADDING")?.Value is "true" or "1",
+                AnsiWarnings = setOptsEl.Attribute("ANSI_WARNINGS")?.Value is "true" or "1",
+                ArithAbort = setOptsEl.Attribute("ARITHABORT")?.Value is "true" or "1",
+                ConcatNullYieldsNull = setOptsEl.Attribute("CONCAT_NULL_YIELDS_NULL")?.Value is "true" or "1",
+                NumericRoundAbort = setOptsEl.Attribute("NUMERIC_ROUNDABORT")?.Value is "true" or "1",
+                QuotedIdentifier = setOptsEl.Attribute("QUOTED_IDENTIFIER")?.Value is "true" or "1"
+            };
+        }
+
+        // Memory grant info
+        var memEl = queryPlanEl.Element(Ns + "MemoryGrantInfo");
+        if (memEl != null)
+        {
+            stmt.MemoryGrant = new MemoryGrantInfo
+            {
+                SerialRequiredMemoryKB = ParseLong(memEl.Attribute("SerialRequiredMemory")?.Value),
+                SerialDesiredMemoryKB = ParseLong(memEl.Attribute("SerialDesiredMemory")?.Value),
+                RequiredMemoryKB = ParseLong(memEl.Attribute("RequiredMemory")?.Value),
+                DesiredMemoryKB = ParseLong(memEl.Attribute("DesiredMemory")?.Value),
+                RequestedMemoryKB = ParseLong(memEl.Attribute("RequestedMemory")?.Value),
+                GrantedMemoryKB = ParseLong(memEl.Attribute("GrantedMemory")?.Value),
+                MaxUsedMemoryKB = ParseLong(memEl.Attribute("MaxUsedMemory")?.Value),
+                GrantWaitTimeMs = ParseLong(memEl.Attribute("GrantWaitTime")?.Value),
+                LastRequestedMemoryKB = ParseLong(memEl.Attribute("LastRequestedMemory")?.Value),
+                IsMemoryGrantFeedbackAdjusted = memEl.Attribute("IsMemoryGrantFeedbackAdjusted")?.Value
+            };
+        }
+
+        // Statement-level metadata from QueryPlan attributes
+        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.CompileTimeMs = ParseLong(queryPlanEl.Attribute("CompileTime")?.Value);
+        stmt.CompileMemoryKB = ParseLong(queryPlanEl.Attribute("CompileMemory")?.Value);
+        stmt.CompileCPUMs = ParseLong(queryPlanEl.Attribute("CompileCPU")?.Value);
+
+        // Fallback: some plans have CE version on QueryPlan instead of StmtSimple
+        if (stmt.CardinalityEstimationModelVersion == 0)
+            stmt.CardinalityEstimationModelVersion = (int)ParseDouble(queryPlanEl.Attribute("CardinalityEstimationModelVersion")?.Value);
+
+        // Wave 2.5: MaxQueryMemory
+        stmt.MaxQueryMemoryKB = ParseLong(queryPlanEl.Attribute("MaxQueryMemory")?.Value);
+
+        // Wave 3.1: EffectiveDOP + DOP feedback
+        stmt.EffectiveDOP = (int)ParseDouble(queryPlanEl.Attribute("EffectiveDegreeOfParallelism")?.Value);
+        stmt.DOPFeedbackAdjusted = queryPlanEl.Attribute("IsDOPFeedbackAdjusted")?.Value;
+
+        // Wave 3.4: Plan Guide attributes
+        stmt.PlanGuideDB = queryPlanEl.Attribute("PlanGuideDB")?.Value;
+        stmt.PlanGuideName = queryPlanEl.Attribute("PlanGuideName")?.Value;
+        stmt.UsePlan = queryPlanEl.Attribute("UsePlan")?.Value is "true" or "1";
+
+        // Wave 3.5: ParameterizedText
+        stmt.ParameterizedText = queryPlanEl.Element(Ns + "ParameterizedText")?.Value;
+
+        // XSD gap: QueryPlan-level attributes
+        stmt.ContainsInterleavedExecutionCandidates = queryPlanEl.Attribute("ContainsInterleavedExecutionCandidates")?.Value is "true" or "1";
+        stmt.ContainsInlineScalarTsqlUdfs = queryPlanEl.Attribute("ContainsInlineScalarTsqlUdfs")?.Value is "true" or "1";
+        stmt.QueryVariantID = (int)ParseDouble(queryPlanEl.Attribute("QueryVariantID")?.Value);
+        stmt.DispatcherPlanHandle = queryPlanEl.Attribute("DispatcherPlanHandle")?.Value;
+        stmt.ExclusiveProfileTimeActive = queryPlanEl.Attribute("ExclusiveProfileTimeActive")?.Value is "true" or "1";
+
+        // XSD gap: OptimizationReplay
+        var optReplayEl = queryPlanEl.Element(Ns + "OptimizationReplay");
+        if (optReplayEl != null)
+            stmt.OptimizationReplayScript = optReplayEl.Attribute("Script")?.Value;
+
+        // Missing indexes
+        stmt.MissingIndexes = ParseMissingIndexes(queryPlanEl);
+
+        // Wave 2.8: QueryPlan-level warnings
+        var planWarningsEl = queryPlanEl.Element(Ns + "Warnings");
+        if (planWarningsEl != null)
+            stmt.PlanWarnings = ParseWarningsFromElement(planWarningsEl);
+
+        // OptimizerHardwareDependentProperties
+        var hwEl = queryPlanEl.Element(Ns + "OptimizerHardwareDependentProperties");
+        if (hwEl != null)
+        {
+            stmt.HardwareProperties = new OptimizerHardwareInfo
+            {
+                EstimatedAvailableMemoryGrant = ParseLong(hwEl.Attribute("EstimatedAvailableMemoryGrant")?.Value),
+                EstimatedPagesCached = ParseLong(hwEl.Attribute("EstimatedPagesCached")?.Value),
+                EstimatedAvailableDOP = (int)ParseDouble(hwEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
+                MaxCompileMemory = ParseLong(hwEl.Attribute("MaxCompileMemory")?.Value)
+            };
+        }
+
+        // OptimizerStatsUsage
+        var statsUsageEl = queryPlanEl.Element(Ns + "OptimizerStatsUsage");
+        if (statsUsageEl != null)
+        {
+            foreach (var statEl in statsUsageEl.Elements(Ns + "StatisticsInfo"))
+            {
+                stmt.StatsUsage.Add(new OptimizerStatsUsageItem
+                {
+                    StatisticsName = statEl.Attribute("Statistics")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    TableName = statEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    DatabaseName = statEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", ""),
+                    SchemaName = statEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", ""),
+                    ModificationCount = ParseLong(statEl.Attribute("ModificationCount")?.Value),
+                    SamplingPercent = ParseDouble(statEl.Attribute("SamplingPercent")?.Value),
+                    LastUpdate = statEl.Attribute("LastUpdate")?.Value
+                });
+            }
+        }
+
+        // ThreadStat (actual plans)
+        var threadStatEl = queryPlanEl.Element(Ns + "ThreadStat");
+        if (threadStatEl != null)
+        {
+            stmt.ThreadStats = new ThreadStatInfo
+            {
+                Branches = (int)ParseDouble(threadStatEl.Attribute("Branches")?.Value),
+                UsedThreads = (int)ParseDouble(threadStatEl.Attribute("UsedThreads")?.Value)
+            };
+            foreach (var trEl in threadStatEl.Elements(Ns + "ThreadReservation"))
+            {
+                stmt.ThreadStats.Reservations.Add(new ThreadReservation
+                {
+                    NodeId = (int)ParseDouble(trEl.Attribute("NodeId")?.Value),
+                    ReservedThreads = (int)ParseDouble(trEl.Attribute("ReservedThreads")?.Value)
+                });
+            }
+        }
+
+        // ParameterList
+        var paramListEl = queryPlanEl.Element(Ns + "ParameterList");
+        if (paramListEl != null)
+        {
+            foreach (var paramEl in paramListEl.Elements(Ns + "ColumnReference"))
+            {
+                stmt.Parameters.Add(new PlanParameter
+                {
+                    Name = paramEl.Attribute("Column")?.Value ?? "",
+                    DataType = paramEl.Attribute("ParameterDataType")?.Value ?? "",
+                    CompiledValue = paramEl.Attribute("ParameterCompiledValue")?.Value,
+                    RuntimeValue = paramEl.Attribute("ParameterRuntimeValue")?.Value
+                });
+            }
+        }
+
+        // WaitStats (actual plans)
+        var waitStatsEl = queryPlanEl.Element(Ns + "WaitStats");
+        if (waitStatsEl != null)
+        {
+            foreach (var waitEl in waitStatsEl.Elements(Ns + "Wait"))
+            {
+                stmt.WaitStats.Add(new WaitStatInfo
+                {
+                    WaitType = waitEl.Attribute("WaitType")?.Value ?? "",
+                    WaitTimeMs = ParseLong(waitEl.Attribute("WaitTimeMs")?.Value),
+                    WaitCount = ParseLong(waitEl.Attribute("WaitCount")?.Value)
+                });
+            }
+        }
+
+        // QueryTimeStats (actual plans)
+        var queryTimeEl = queryPlanEl.Element(Ns + "QueryTimeStats");
+        if (queryTimeEl != null)
+        {
+            stmt.QueryTimeStats = new QueryTimeInfo
+            {
+                CpuTimeMs = ParseLong(queryTimeEl.Attribute("CpuTime")?.Value),
+                ElapsedTimeMs = ParseLong(queryTimeEl.Attribute("ElapsedTime")?.Value)
+            };
+            stmt.QueryUdfCpuTimeMs = ParseLong(queryTimeEl.Attribute("UdfCpuTime")?.Value);
+            stmt.QueryUdfElapsedTimeMs = ParseLong(queryTimeEl.Attribute("UdfElapsedTime")?.Value);
+        }
+
+        // Wave 3.12: TraceFlags
+        foreach (var traceFlagsEl in queryPlanEl.Elements(Ns + "TraceFlags"))
+        {
+            var isCompile = traceFlagsEl.Attribute("IsCompileTime")?.Value is "true" or "1";
+            foreach (var tf in traceFlagsEl.Elements(Ns + "TraceFlag"))
+            {
+                stmt.TraceFlags.Add(new TraceFlagInfo
+                {
+                    Value = (int)ParseDouble(tf.Attribute("Value")?.Value),
+                    Scope = tf.Attribute("Scope")?.Value ?? "",
+                    IsCompileTime = isCompile
+                });
+            }
+        }
+
+        // Wave 3.13: IndexedViewInfo
+        var ivInfoEl = queryPlanEl.Element(Ns + "IndexedViewInfo");
+        if (ivInfoEl != null)
+        {
+            foreach (var objEl in ivInfoEl.Elements(Ns + "Object"))
+            {
+                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+                var parts = new List<string>();
+                if (!string.IsNullOrEmpty(db)) parts.Add(db);
+                if (!string.IsNullOrEmpty(schema)) parts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) parts.Add(table);
+                if (!string.IsNullOrEmpty(index)) parts.Add(index);
+                var name = string.Join(".", parts);
+                if (!string.IsNullOrEmpty(name))
+                    stmt.IndexedViews.Add(name);
+            }
+        }
+
+        // XSD gap: CardinalityFeedback
+        var ceFeedbackEl = queryPlanEl.Element(Ns + "CardinalityFeedback");
+        if (ceFeedbackEl != null)
+        {
+            foreach (var entry in ceFeedbackEl.Elements(Ns + "Entry"))
+            {
+                stmt.CardinalityFeedback.Add(new CardinalityFeedbackEntry
+                {
+                    Key = ParseLong(entry.Attribute("Key")?.Value),
+                    Value = ParseLong(entry.Attribute("Value")?.Value)
+                });
+            }
+        }
+    }
+
+    private static PlanNode ParseRelOp(XElement relOpEl)
+    {
+        var node = new PlanNode
+        {
+            NodeId = (int)ParseDouble(relOpEl.Attribute("NodeId")?.Value),
+            PhysicalOp = relOpEl.Attribute("PhysicalOp")?.Value ?? "",
+            LogicalOp = relOpEl.Attribute("LogicalOp")?.Value ?? "",
+            EstimatedTotalSubtreeCost = ParseDouble(relOpEl.Attribute("EstimatedTotalSubtreeCost")?.Value),
+            EstimateRows = ParseDouble(relOpEl.Attribute("EstimateRows")?.Value),
+            EstimateIO = ParseDouble(relOpEl.Attribute("EstimateIO")?.Value),
+            EstimateCPU = ParseDouble(relOpEl.Attribute("EstimateCPU")?.Value),
+            EstimateRebinds = ParseDouble(relOpEl.Attribute("EstimateRebinds")?.Value),
+            EstimateRewinds = ParseDouble(relOpEl.Attribute("EstimateRewinds")?.Value),
+            EstimatedRowSize = (int)ParseDouble(relOpEl.Attribute("AvgRowSize")?.Value),
+            Parallel = relOpEl.Attribute("Parallel")?.Value is "true" or "1",
+            Partitioned = relOpEl.Attribute("Partitioned")?.Value is "true" or "1",
+            ExecutionMode = relOpEl.Attribute("EstimatedExecutionMode")?.Value,
+            IsAdaptive = relOpEl.Attribute("IsAdaptive")?.Value is "true" or "1",
+            AdaptiveThresholdRows = ParseDouble(relOpEl.Attribute("AdaptiveThresholdRows")?.Value),
+            EstimatedJoinType = relOpEl.Attribute("EstimatedJoinType")?.Value,
+            // Wave 3.14: Estimated DOP per operator
+            EstimatedDOP = (int)ParseDouble(relOpEl.Attribute("EstimatedAvailableDegreeOfParallelism")?.Value),
+            // XSD gap: RelOp-level metadata
+            GroupExecuted = relOpEl.Attribute("GroupExecuted")?.Value is "true" or "1",
+            RemoteDataAccess = relOpEl.Attribute("RemoteDataAccess")?.Value is "true" or "1",
+            OptimizedHalloweenProtectionUsed = relOpEl.Attribute("OptimizedHalloweenProtectionUsed")?.Value is "true" or "1",
+            StatsCollectionId = ParseLong(relOpEl.Attribute("StatsCollectionId")?.Value)
+        };
+
+        // Map to icon
+        node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
+
+        // Handle operator-specific element
+        var physicalOpEl = GetOperatorElement(relOpEl);
+        if (physicalOpEl != null)
+        {
+            // Object reference (table/index name) — scoped to stop at child RelOps
+            var objEl = ScopedDescendants(physicalOpEl, Ns + "Object").FirstOrDefault();
+            if (objEl != null)
+            {
+                var db = objEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                var schema = objEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                var table = objEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                var index = objEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+
+                node.DatabaseName = db;
+                node.IndexName = index;
+
+                var shortParts = new List<string>();
+                if (!string.IsNullOrEmpty(schema)) shortParts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) shortParts.Add(table);
+                node.ObjectName = shortParts.Count > 0 ? string.Join(".", shortParts) : null;
+
+                var fullParts = new List<string>();
+                if (!string.IsNullOrEmpty(db)) fullParts.Add(db);
+                if (!string.IsNullOrEmpty(schema)) fullParts.Add(schema);
+                if (!string.IsNullOrEmpty(table)) fullParts.Add(table);
+                var fullName = string.Join(".", fullParts);
+                if (!string.IsNullOrEmpty(index))
+                    fullName += $".{index}";
+                node.FullObjectName = !string.IsNullOrEmpty(fullName) ? fullName : null;
+
+                node.StorageType = objEl.Attribute("Storage")?.Value;
+                node.ServerName = objEl.Attribute("Server")?.Value?.Replace("[", "").Replace("]", "");
+                node.ObjectAlias = objEl.Attribute("Alias")?.Value?.Replace("[", "").Replace("]", "");
+                node.IndexKind = objEl.Attribute("IndexKind")?.Value;
+                node.FilteredIndex = objEl.Attribute("Filtered")?.Value is "true" or "1";
+                node.TableReferenceId = (int)ParseDouble(objEl.Attribute("TableReferenceId")?.Value);
+            }
+
+            // Hash keys for hash match operators
+            var hashKeysProbeEl = physicalOpEl.Element(Ns + "HashKeysProbe");
+            if (hashKeysProbeEl != null)
+            {
+                var cols = hashKeysProbeEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                node.HashKeysProbe = string.Join(", ", cols);
+            }
+            var hashKeysBuildEl = physicalOpEl.Element(Ns + "HashKeysBuild");
+            if (hashKeysBuildEl != null)
+            {
+                var cols = hashKeysBuildEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                node.HashKeysBuild = string.Join(", ", cols);
+            }
+
+            // Ordered attribute
+            node.Ordered = physicalOpEl.Attribute("Ordered")?.Value == "true" || physicalOpEl.Attribute("Ordered")?.Value == "1";
+
+            // Seek predicates — scoped to stop at child RelOps
+            var seekPreds = ScopedDescendants(physicalOpEl, Ns + "SeekPredicateNew")
+                .Concat(ScopedDescendants(physicalOpEl, Ns + "SeekPredicate"));
+            var seekParts = new List<string>();
+            foreach (var sp in seekPreds)
+            {
+                var scalarOps = sp.Descendants(Ns + "ScalarOperator");
+                foreach (var so in scalarOps)
+                {
+                    var val = so.Attribute("ScalarString")?.Value;
+                    if (!string.IsNullOrEmpty(val))
+                        seekParts.Add(val);
+                }
+            }
+            if (seekParts.Count > 0)
+                node.SeekPredicates = string.Join(" AND ", seekParts);
+
+            // Residual predicate
+            var predEl = physicalOpEl.Elements(Ns + "Predicate").FirstOrDefault();
+            if (predEl != null)
+            {
+                var scalarOp = predEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.Predicate = scalarOp?.Attribute("ScalarString")?.Value;
+            }
+
+            // Partitioning type (for parallelism operators)
+            node.PartitioningType = physicalOpEl.Attribute("PartitioningType")?.Value;
+
+            // Build/Probe residuals (Hash Match)
+            var buildResEl = physicalOpEl.Element(Ns + "BuildResidual");
+            if (buildResEl != null)
+            {
+                var so = buildResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.BuildResidual = so?.Attribute("ScalarString")?.Value;
+            }
+            var probeResEl = physicalOpEl.Element(Ns + "ProbeResidual");
+            if (probeResEl != null)
+            {
+                var so = probeResEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.ProbeResidual = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // Wave 2.1/2.2: Merge Residual + PassThru (Merge Join + Nested Loops)
+            var residualEl = physicalOpEl.Element(Ns + "Residual");
+            if (residualEl != null)
+            {
+                var so = residualEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.MergeResidual = so?.Attribute("ScalarString")?.Value;
+            }
+            var passThruEl = physicalOpEl.Element(Ns + "PassThru");
+            if (passThruEl != null)
+            {
+                var so = passThruEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.PassThru = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // OrderBy columns (Sort operator)
+            var orderByEl = physicalOpEl.Element(Ns + "OrderBy");
+            if (orderByEl != null)
+            {
+                var obParts = orderByEl.Elements(Ns + "OrderByColumn")
+                    .Select(obc =>
+                    {
+                        var ascending = obc.Attribute("Ascending")?.Value != "false";
+                        var colRef = obc.Element(Ns + "ColumnReference");
+                        var name = colRef != null ? FormatColumnRef(colRef) : "";
+                        return string.IsNullOrEmpty(name) ? "" : $"{name} {(ascending ? "ASC" : "DESC")}";
+                    })
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var obStr = string.Join(", ", obParts);
+                if (!string.IsNullOrEmpty(obStr))
+                    node.OrderBy = obStr;
+            }
+
+            // OuterReferences (Nested Loops)
+            var outerRefsEl = physicalOpEl.Element(Ns + "OuterReferences");
+            if (outerRefsEl != null)
+            {
+                var refs = outerRefsEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var refsStr = string.Join(", ", refs);
+                if (!string.IsNullOrEmpty(refsStr))
+                    node.OuterReferences = refsStr;
+            }
+
+            // Inner/Outer side join columns (Merge Join)
+            node.InnerSideJoinColumns = ParseColumnList(physicalOpEl, "InnerSideJoinColumns");
+            node.OuterSideJoinColumns = ParseColumnList(physicalOpEl, "OuterSideJoinColumns");
+
+            // GroupBy columns (Hash/Stream Aggregate)
+            node.GroupBy = ParseColumnList(physicalOpEl, "GroupBy");
+
+            // Partition columns (Parallelism)
+            node.PartitionColumns = ParseColumnList(physicalOpEl, "PartitionColumns");
+
+            // Wave 2.6: Parallelism HashKeys
+            node.HashKeys = ParseColumnList(physicalOpEl, "HashKeys");
+
+            // Segment column
+            var segColEl = physicalOpEl.Element(Ns + "SegmentColumn")?.Element(Ns + "ColumnReference");
+            if (segColEl != null)
+                node.SegmentColumn = FormatColumnRef(segColEl);
+
+            // Defined values (Compute Scalar)
+            var definedValsEl = physicalOpEl.Element(Ns + "DefinedValues");
+            if (definedValsEl != null)
+            {
+                var dvParts = new List<string>();
+                foreach (var dvEl in definedValsEl.Elements(Ns + "DefinedValue"))
+                {
+                    var colRef = dvEl.Element(Ns + "ColumnReference");
+                    var scalarOp = dvEl.Element(Ns + "ScalarOperator");
+                    var colName = colRef != null ? FormatColumnRef(colRef) : "";
+                    var expr = scalarOp?.Attribute("ScalarString")?.Value ?? "";
+                    if (!string.IsNullOrEmpty(colName) && !string.IsNullOrEmpty(expr))
+                        dvParts.Add($"{colName} = {expr}");
+                    else if (!string.IsNullOrEmpty(expr))
+                        dvParts.Add(expr);
+                    else if (!string.IsNullOrEmpty(colName))
+                        dvParts.Add(colName);
+                }
+                if (dvParts.Count > 0)
+                    node.DefinedValues = string.Join("; ", dvParts);
+            }
+
+            // IndexScan / TableScan properties
+            node.ScanDirection = physicalOpEl.Attribute("ScanDirection")?.Value;
+            node.ForcedIndex = physicalOpEl.Attribute("ForcedIndex")?.Value is "true" or "1";
+            node.ForceScan = physicalOpEl.Attribute("ForceScan")?.Value is "true" or "1";
+            node.ForceSeek = physicalOpEl.Attribute("ForceSeek")?.Value is "true" or "1";
+            node.NoExpandHint = physicalOpEl.Attribute("NoExpandHint")?.Value is "true" or "1";
+            node.Lookup = physicalOpEl.Attribute("Lookup")?.Value is "true" or "1";
+            node.DynamicSeek = physicalOpEl.Attribute("DynamicSeek")?.Value is "true" or "1";
+
+            // Table cardinality and rows to be read (on <RelOp> per XSD)
+            node.TableCardinality = ParseDouble(relOpEl.Attribute("TableCardinality")?.Value);
+            node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimatedRowsRead")?.Value);
+            if (node.EstimatedRowsRead == 0)
+                node.EstimatedRowsRead = ParseDouble(relOpEl.Attribute("EstimateRowsWithoutRowGoal")?.Value);
+
+            // TOP operator properties
+            var topExprEl = physicalOpEl.Element(Ns + "TopExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+            if (topExprEl != null)
+                node.TopExpression = topExprEl.Attribute("ScalarString")?.Value;
+            node.IsPercent = physicalOpEl.Attribute("IsPercent")?.Value is "true" or "1";
+            node.WithTies = physicalOpEl.Attribute("WithTies")?.Value is "true" or "1";
+
+            // Wave 2.7: Top OffsetExpression, RowCount, Rows
+            var offsetEl = physicalOpEl.Element(Ns + "OffsetExpression")?.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+            if (offsetEl != null)
+                node.OffsetExpression = offsetEl.Attribute("ScalarString")?.Value;
+            node.RowCount = physicalOpEl.Attribute("RowCount")?.Value is "true" or "1";
+            node.TopRows = (int)ParseDouble(physicalOpEl.Attribute("Rows")?.Value);
+
+            // Sort properties
+            node.SortDistinct = physicalOpEl.Attribute("Distinct")?.Value is "true" or "1";
+
+            // Filter properties
+            node.StartupExpression = physicalOpEl.Attribute("StartupExpression")?.Value is "true" or "1";
+
+            // Nested Loops properties
+            node.NLOptimized = physicalOpEl.Attribute("Optimized")?.Value is "true" or "1";
+            node.WithOrderedPrefetch = physicalOpEl.Attribute("WithOrderedPrefetch")?.Value is "true" or "1";
+            node.WithUnorderedPrefetch = physicalOpEl.Attribute("WithUnorderedPrefetch")?.Value is "true" or "1";
+
+            // Hash Match properties
+            node.ManyToMany = physicalOpEl.Attribute("ManyToMany")?.Value is "true" or "1";
+            node.BitmapCreator = physicalOpEl.Attribute("BitmapCreator")?.Value is "true" or "1";
+
+            // Parallelism properties
+            node.Remoting = physicalOpEl.Attribute("Remoting")?.Value is "true" or "1";
+            node.LocalParallelism = physicalOpEl.Attribute("LocalParallelism")?.Value is "true" or "1";
+
+            // Wave 3.8: Spool Stack + PrimaryNodeId
+            node.SpoolStack = physicalOpEl.Attribute("Stack")?.Value is "true" or "1";
+            node.PrimaryNodeId = (int)ParseDouble(physicalOpEl.Attribute("PrimaryNodeId")?.Value);
+
+            // Eager Index Spool — suggest CREATE INDEX from SeekPredicateNew + OutputList
+            if (node.LogicalOp == "Eager Spool")
+            {
+                var spoolSeek = physicalOpEl.Element(Ns + "SeekPredicateNew")
+                             ?? physicalOpEl.Element(Ns + "SeekPredicate");
+                if (spoolSeek != null)
+                {
+                    var rangeCols = spoolSeek.Descendants(Ns + "RangeColumns")
+                        .SelectMany(rc => rc.Elements(Ns + "ColumnReference"));
+
+                    var keyColumns = new List<string>();
+                    string? tblSchema = null;
+                    string? tblName = null;
+
+                    foreach (var col in rangeCols)
+                    {
+                        var colName = col.Attribute("Column")?.Value;
+                        if (!string.IsNullOrEmpty(colName))
+                            keyColumns.Add(colName);
+                        tblSchema ??= col.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                        tblName ??= col.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                    }
+
+                    if (keyColumns.Count > 0 && !string.IsNullOrEmpty(tblName))
+                    {
+                        var includeCols = relOpEl.Element(Ns + "OutputList")?.Elements(Ns + "ColumnReference")
+                            .Select(c => c.Attribute("Column")?.Value)
+                            .Where(c => !string.IsNullOrEmpty(c) && !keyColumns.Contains(c))
+                            .ToList() ?? new List<string?>();
+
+                        var prefix = !string.IsNullOrEmpty(tblSchema) ? $"{tblSchema}.{tblName}" : tblName;
+                        var keyStr = string.Join(", ", keyColumns);
+                        var sql = $"CREATE INDEX [{string.Join("_", keyColumns)}] ON {prefix} ({keyStr})";
+                        if (includeCols.Count > 0)
+                            sql += $" INCLUDE ({string.Join(", ", includeCols)})";
+                        sql += ";";
+                        node.SuggestedIndex = sql;
+                    }
+                }
+            }
+
+            // Wave 3.9: Update DMLRequestSort + ActionColumn
+            node.DMLRequestSort = physicalOpEl.Attribute("DMLRequestSort")?.Value is "true" or "1";
+            var actionColEl = physicalOpEl.Element(Ns + "ActionColumn")?.Element(Ns + "ColumnReference");
+            if (actionColEl != null)
+                node.ActionColumn = FormatColumnRef(actionColEl);
+
+            // SET predicate (UPDATE operator)
+            var setPredicateEl = physicalOpEl.Element(Ns + "SetPredicate");
+            if (setPredicateEl != null)
+            {
+                var so = setPredicateEl.Descendants(Ns + "ScalarOperator").FirstOrDefault();
+                node.SetPredicate = so?.Attribute("ScalarString")?.Value;
+            }
+
+            // ActualJoinType from runtime info on adaptive joins
+            node.ActualJoinType = physicalOpEl.Attribute("ActualJoinType")?.Value;
+
+            // XSD gap: ForceSeekColumnCount (IndexScan)
+            node.ForceSeekColumnCount = (int)ParseDouble(physicalOpEl.Attribute("ForceSeekColumnCount")?.Value);
+
+            // XSD gap: PartitionId (IndexScan, TableScan, Sort, NestedLoops, AdaptiveJoin)
+            var partitionIdEl = physicalOpEl.Element(Ns + "PartitionId");
+            if (partitionIdEl != null)
+            {
+                var pidCols = partitionIdEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var pidStr = string.Join(", ", pidCols);
+                if (!string.IsNullOrEmpty(pidStr))
+                    node.PartitionId = pidStr;
+            }
+
+            // XSD gap: StarJoinInfo (Hash, Merge, NL, AdaptiveJoin)
+            var starJoinEl = physicalOpEl.Element(Ns + "StarJoinInfo");
+            if (starJoinEl != null)
+            {
+                node.IsStarJoin = starJoinEl.Attribute("Root")?.Value is "true" or "1";
+                node.StarJoinOperationType = starJoinEl.Attribute("OperationType")?.Value;
+            }
+
+            // XSD gap: ProbeColumn (NL, Parallelism, Update)
+            var probeColEl = physicalOpEl.Element(Ns + "ProbeColumn")?.Element(Ns + "ColumnReference");
+            if (probeColEl != null)
+                node.ProbeColumn = FormatColumnRef(probeColEl);
+
+            // XSD gap: InRow (Parallelism)
+            node.InRow = physicalOpEl.Attribute("InRow")?.Value is "true" or "1";
+
+            // XSD gap: ComputeSequence (ComputeScalar)
+            node.ComputeSequence = physicalOpEl.Attribute("ComputeSequence")?.Value is "true" or "1";
+
+            // XSD gap: RollupInfo (StreamAggregate)
+            var rollupEl = physicalOpEl.Element(Ns + "RollupInfo");
+            if (rollupEl != null)
+            {
+                node.RollupHighestLevel = (int)ParseDouble(rollupEl.Attribute("HighestLevel")?.Value);
+                foreach (var rlEl in rollupEl.Elements(Ns + "RollupLevel"))
+                    node.RollupLevels.Add((int)ParseDouble(rlEl.Attribute("Level")?.Value));
+            }
+
+            // XSD gap: TVF ParameterList
+            var tvfParamListEl = physicalOpEl.Element(Ns + "ParameterList");
+            if (tvfParamListEl != null)
+            {
+                var tvfCols = tvfParamListEl.Elements(Ns + "ColumnReference")
+                    .Select(c => FormatColumnRef(c))
+                    .Where(s => !string.IsNullOrEmpty(s));
+                var tvfStr = string.Join(", ", tvfCols);
+                if (!string.IsNullOrEmpty(tvfStr))
+                    node.TvfParameters = tvfStr;
+                // Also check for ScalarOperator children (TVF can have scalar params)
+                if (string.IsNullOrEmpty(node.TvfParameters))
+                {
+                    var tvfScalars = tvfParamListEl.Elements(Ns + "ScalarOperator")
+                        .Select(s => s.Attribute("ScalarString")?.Value)
+                        .Where(s => !string.IsNullOrEmpty(s));
+                    var tvfScalarStr = string.Join(", ", tvfScalars);
+                    if (!string.IsNullOrEmpty(tvfScalarStr))
+                        node.TvfParameters = tvfScalarStr;
+                }
+            }
+
+            // XSD gap: OriginalActionColumn (Update)
+            var origActionColEl = physicalOpEl.Element(Ns + "OriginalActionColumn")?.Element(Ns + "ColumnReference");
+            if (origActionColEl != null)
+                node.OriginalActionColumn = FormatColumnRef(origActionColEl);
+
+            // XSD gap: Scalar UDF structured detection
+            foreach (var udfEl in ScopedDescendants(physicalOpEl, Ns + "UserDefinedFunction"))
+            {
+                var udfRef = new ScalarUdfReference
+                {
+                    FunctionName = udfEl.Attribute("FunctionName")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    IsClrFunction = udfEl.Attribute("IsClrFunction")?.Value is "true" or "1"
+                };
+                var clrEl = udfEl.Element(Ns + "CLRFunction");
+                if (clrEl != null)
+                {
+                    udfRef.ClrAssembly = clrEl.Attribute("Assembly")?.Value;
+                    udfRef.ClrClass = clrEl.Attribute("Class")?.Value;
+                    udfRef.ClrMethod = clrEl.Attribute("Method")?.Value;
+                }
+                if (!string.IsNullOrEmpty(udfRef.FunctionName))
+                    node.ScalarUdfs.Add(udfRef);
+            }
+
+            // XSD gap: TieColumns (Top operator)
+            node.TieColumns = ParseColumnList(physicalOpEl, "TieColumns");
+
+            // XSD gap: UDXName (Extension operator)
+            node.UdxName = physicalOpEl.Attribute("UDXName")?.Value;
+
+            // XSD gap: Operator-level IndexedViewInfo
+            var opIvInfoEl = physicalOpEl.Element(Ns + "IndexedViewInfo");
+            if (opIvInfoEl != null)
+            {
+                foreach (var ivObjEl in opIvInfoEl.Elements(Ns + "Object"))
+                {
+                    var ivDb = ivObjEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivSchema = ivObjEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivTable = ivObjEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivIndex = ivObjEl.Attribute("Index")?.Value?.Replace("[", "").Replace("]", "");
+                    var ivParts = new List<string>();
+                    if (!string.IsNullOrEmpty(ivDb)) ivParts.Add(ivDb);
+                    if (!string.IsNullOrEmpty(ivSchema)) ivParts.Add(ivSchema);
+                    if (!string.IsNullOrEmpty(ivTable)) ivParts.Add(ivTable);
+                    if (!string.IsNullOrEmpty(ivIndex)) ivParts.Add(ivIndex);
+                    var ivName = string.Join(".", ivParts);
+                    if (!string.IsNullOrEmpty(ivName))
+                        node.OperatorIndexedViews.Add(ivName);
+                }
+            }
+
+            // XSD gap: NamedParameterList (IndexScan)
+            var namedParamListEl = physicalOpEl.Element(Ns + "NamedParameterList");
+            if (namedParamListEl != null)
+            {
+                foreach (var npEl in namedParamListEl.Elements(Ns + "NamedParameter"))
+                {
+                    var np = new NamedParameterInfo
+                    {
+                        Name = npEl.Attribute("Name")?.Value ?? ""
+                    };
+                    var npScalar = npEl.Element(Ns + "ScalarOperator");
+                    if (npScalar != null)
+                        np.ScalarString = npScalar.Attribute("ScalarString")?.Value;
+                    if (!string.IsNullOrEmpty(np.Name))
+                        node.NamedParameters.Add(np);
+                }
+            }
+
+            // XSD gap: Remote operator metadata
+            node.RemoteDestination = physicalOpEl.Attribute("RemoteDestination")?.Value;
+            node.RemoteSource = physicalOpEl.Attribute("RemoteSource")?.Value;
+            node.RemoteObject = physicalOpEl.Attribute("RemoteObject")?.Value;
+            node.RemoteQuery = physicalOpEl.Attribute("RemoteQuery")?.Value;
+        }
+
+        // Output columns
+        var outputList = relOpEl.Element(Ns + "OutputList");
+        if (outputList != null)
+        {
+            var cols = outputList.Elements(Ns + "ColumnReference")
+                .Select(c =>
+                {
+                    var col = c.Attribute("Column")?.Value ?? "";
+                    var tbl = c.Attribute("Table")?.Value ?? "";
+                    return string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
+                })
+                .Where(s => !string.IsNullOrEmpty(s));
+            var colList = string.Join(", ", cols);
+            if (!string.IsNullOrEmpty(colList))
+                node.OutputColumns = colList.Replace("[", "").Replace("]", "");
+        }
+
+        // Warnings
+        node.Warnings = ParseWarnings(relOpEl);
+
+        // Wave 3.2: MemoryFractions (on RelOp)
+        var memFracEl = relOpEl.Element(Ns + "MemoryFractions");
+        if (memFracEl != null)
+        {
+            node.MemoryFractionInput = ParseDouble(memFracEl.Attribute("Input")?.Value);
+            node.MemoryFractionOutput = ParseDouble(memFracEl.Attribute("Output")?.Value);
+        }
+
+        // Wave 3.3: RunTimePartitionSummary (on RelOp)
+        var rtPartEl = relOpEl.Element(Ns + "RunTimePartitionSummary");
+        if (rtPartEl != null)
+        {
+            var partAccEl = rtPartEl.Element(Ns + "PartitionsAccessed");
+            if (partAccEl != null)
+            {
+                node.PartitionsAccessed = (int)ParseDouble(partAccEl.Attribute("PartitionCount")?.Value);
+                var ranges = partAccEl.Elements(Ns + "PartitionRange")
+                    .Select(r => $"{r.Attribute("Start")?.Value}-{r.Attribute("End")?.Value}");
+                node.PartitionRanges = string.Join(", ", ranges);
+                if (string.IsNullOrEmpty(node.PartitionRanges))
+                    node.PartitionRanges = null;
+            }
+        }
+
+        // Wave 2.4: Per-operator memory grants (MemoryGrant on RelOp)
+        var memGrantEl = relOpEl.Element(Ns + "MemoryGrant");
+        if (memGrantEl != null)
+        {
+            node.MemoryGrantKB = ParseLong(memGrantEl.Attribute("GrantedMemory")?.Value);
+            node.DesiredMemoryKB = ParseLong(memGrantEl.Attribute("DesiredMemory")?.Value);
+            node.MaxUsedMemoryKB = ParseLong(memGrantEl.Attribute("MaxUsedMemory")?.Value);
+        }
+
+        // Runtime information (actual plan)
+        var runtimeEl = relOpEl.Element(Ns + "RunTimeInformation");
+        if (runtimeEl != null)
+        {
+            node.HasActualStats = true;
+            long totalRows = 0, totalExecutions = 0, totalRowsRead = 0;
+            long totalRebinds = 0, totalRewinds = 0;
+            long maxElapsed = 0, totalCpu = 0;
+            long totalLogicalReads = 0, totalPhysicalReads = 0;
+            long totalScans = 0, totalReadAheads = 0;
+            long totalLobLogicalReads = 0, totalLobPhysicalReads = 0, totalLobReadAheads = 0;
+            long totalSegmentReads = 0, totalSegmentSkips = 0;
+            long totalUdfCpu = 0, maxUdfElapsed = 0;
+            string? actualExecMode = null;
+
+            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
+            {
+                totalRows += ParseLong(thread.Attribute("ActualRows")?.Value);
+                totalExecutions += ParseLong(thread.Attribute("ActualExecutions")?.Value);
+                totalRowsRead += ParseLong(thread.Attribute("ActualRowsRead")?.Value);
+                totalRebinds += ParseLong(thread.Attribute("ActualRebinds")?.Value);
+                totalRewinds += ParseLong(thread.Attribute("ActualRewinds")?.Value);
+                totalCpu += ParseLong(thread.Attribute("ActualCPUms")?.Value);
+                totalLogicalReads += ParseLong(thread.Attribute("ActualLogicalReads")?.Value);
+                totalPhysicalReads += ParseLong(thread.Attribute("ActualPhysicalReads")?.Value);
+                totalScans += ParseLong(thread.Attribute("ActualScans")?.Value);
+                totalReadAheads += ParseLong(thread.Attribute("ActualReadAheads")?.Value);
+                totalLobLogicalReads += ParseLong(thread.Attribute("ActualLobLogicalReads")?.Value);
+                totalLobPhysicalReads += ParseLong(thread.Attribute("ActualLobPhysicalReads")?.Value);
+                totalLobReadAheads += ParseLong(thread.Attribute("ActualLobReadAheads")?.Value);
+
+                // Wave 3.10: Columnstore segment reads/skips
+                totalSegmentReads += ParseLong(thread.Attribute("ActualSegmentReads")?.Value);
+                totalSegmentSkips += ParseLong(thread.Attribute("ActualSegmentSkips")?.Value);
+
+                // Wave 3.11: UDF timing
+                totalUdfCpu += ParseLong(thread.Attribute("UdfCpuTime")?.Value);
+                var udfElapsed = ParseLong(thread.Attribute("UdfElapsedTime")?.Value);
+                if (udfElapsed > maxUdfElapsed) maxUdfElapsed = udfElapsed;
+
+                actualExecMode ??= thread.Attribute("ActualExecutionMode")?.Value;
+
+                var elapsed = ParseLong(thread.Attribute("ActualElapsedms")?.Value);
+                if (elapsed > maxElapsed) maxElapsed = elapsed;
+            }
+
+            node.ActualRows = totalRows;
+            node.ActualExecutions = totalExecutions;
+            node.ActualRowsRead = totalRowsRead;
+            node.ActualRebinds = totalRebinds;
+            node.ActualRewinds = totalRewinds;
+            node.ActualElapsedMs = maxElapsed;
+            node.ActualCPUMs = totalCpu;
+            node.ActualLogicalReads = totalLogicalReads;
+            node.ActualPhysicalReads = totalPhysicalReads;
+            node.ActualScans = totalScans;
+            node.ActualReadAheads = totalReadAheads;
+            node.ActualLobLogicalReads = totalLobLogicalReads;
+            node.ActualLobPhysicalReads = totalLobPhysicalReads;
+            node.ActualLobReadAheads = totalLobReadAheads;
+            node.ActualExecutionMode = actualExecMode;
+            node.ActualSegmentReads = totalSegmentReads;
+            node.ActualSegmentSkips = totalSegmentSkips;
+            node.UdfCpuTimeUs = totalUdfCpu;
+            node.UdfElapsedTimeUs = maxUdfElapsed;
+
+            // Store per-thread data for parallel skew analysis
+            foreach (var thread in runtimeEl.Elements(Ns + "RunTimeCountersPerThread"))
+            {
+                node.PerThreadStats.Add(new PerThreadRuntimeInfo
+                {
+                    ThreadId = (int)ParseDouble(thread.Attribute("Thread")?.Value),
+                    ActualRows = ParseLong(thread.Attribute("ActualRows")?.Value),
+                    ActualExecutions = ParseLong(thread.Attribute("ActualExecutions")?.Value),
+                    ActualElapsedMs = ParseLong(thread.Attribute("ActualElapsedms")?.Value),
+                    ActualCPUMs = ParseLong(thread.Attribute("ActualCPUms")?.Value),
+                    ActualRowsRead = ParseLong(thread.Attribute("ActualRowsRead")?.Value),
+                    ActualLogicalReads = ParseLong(thread.Attribute("ActualLogicalReads")?.Value),
+                    ActualPhysicalReads = ParseLong(thread.Attribute("ActualPhysicalReads")?.Value),
+                    ActualScans = ParseLong(thread.Attribute("ActualScans")?.Value),
+                    ActualReadAheads = ParseLong(thread.Attribute("ActualReadAheads")?.Value),
+                    FirstActiveTime = ParseLong(thread.Attribute("FirstActiveTime")?.Value),
+                    LastActiveTime = ParseLong(thread.Attribute("LastActiveTime")?.Value),
+                    OpenTime = ParseLong(thread.Attribute("OpenTime")?.Value),
+                    FirstRowTime = ParseLong(thread.Attribute("FirstRowTime")?.Value),
+                    LastRowTime = ParseLong(thread.Attribute("LastRowTime")?.Value),
+                    CloseTime = ParseLong(thread.Attribute("CloseTime")?.Value),
+                    InputMemoryGrant = ParseLong(thread.Attribute("InputMemoryGrant")?.Value),
+                    OutputMemoryGrant = ParseLong(thread.Attribute("OutputMemoryGrant")?.Value),
+                    UsedMemoryGrant = ParseLong(thread.Attribute("UsedMemoryGrant")?.Value),
+                    Batches = ParseLong(thread.Attribute("Batches")?.Value),
+                    ActualEndOfScans = ParseLong(thread.Attribute("ActualEndOfScans")?.Value),
+                    ActualLocallyAggregatedRows = ParseLong(thread.Attribute("ActualLocallyAggregatedRows")?.Value),
+                    IsInterleavedExecuted = thread.Attribute("IsInterleavedExecuted")?.Value is "true" or "1",
+                    RowRequalifications = ParseLong(thread.Attribute("RowRequalifications")?.Value)
+                });
+            }
+        }
+
+        // Recurse into child RelOps
+        foreach (var childRelOp in FindChildRelOps(relOpEl))
+        {
+            var childNode = ParseRelOp(childRelOp);
+            childNode.Parent = node;
+            node.Children.Add(childNode);
+        }
+
+        return node;
+    }
+
+    private static XElement? GetOperatorElement(XElement relOpEl)
+    {
+        foreach (var child in relOpEl.Elements())
+        {
+            var name = child.Name.LocalName;
+            if (name != "OutputList" && name != "RunTimeInformation" && name != "Warnings"
+                && name != "MemoryFractions" && name != "RunTimePartitionSummary"
+                && name != "MemoryGrant" && name != "InternalInfo")
+            {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    private static IEnumerable<XElement> FindChildRelOps(XElement relOpEl)
+    {
+        var operatorEl = GetOperatorElement(relOpEl);
+        if (operatorEl == null) yield break;
+
+        foreach (var child in operatorEl.Elements(Ns + "RelOp"))
+            yield return child;
+
+        foreach (var child in operatorEl.Elements())
+        {
+            if (child.Name.LocalName == "RelOp") continue;
+            foreach (var nestedRelOp in child.Elements(Ns + "RelOp"))
+                yield return nestedRelOp;
+        }
+    }
+
+    private static List<MissingIndex> ParseMissingIndexes(XElement queryPlanEl)
+    {
+        var result = new List<MissingIndex>();
+        var missingIndexesEl = queryPlanEl.Element(Ns + "MissingIndexes");
+        if (missingIndexesEl == null) return result;
+
+        foreach (var groupEl in missingIndexesEl.Elements(Ns + "MissingIndexGroup"))
+        {
+            var impact = ParseDouble(groupEl.Attribute("Impact")?.Value);
+            foreach (var indexEl in groupEl.Elements(Ns + "MissingIndex"))
+            {
+                var mi = new MissingIndex
+                {
+                    Database = indexEl.Attribute("Database")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Schema = indexEl.Attribute("Schema")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Table = indexEl.Attribute("Table")?.Value?.Replace("[", "").Replace("]", "") ?? "",
+                    Impact = impact
+                };
+
+                foreach (var colGroup in indexEl.Elements(Ns + "ColumnGroup"))
+                {
+                    var usage = colGroup.Attribute("Usage")?.Value ?? "";
+                    var cols = colGroup.Elements(Ns + "Column")
+                        .Select(c => c.Attribute("Name")?.Value?.Replace("[", "").Replace("]", "") ?? "")
+                        .Where(s => !string.IsNullOrEmpty(s))
+                        .ToList();
+
+                    switch (usage)
+                    {
+                        case "EQUALITY": mi.EqualityColumns = cols; break;
+                        case "INEQUALITY": mi.InequalityColumns = cols; break;
+                        case "INCLUDE": mi.IncludeColumns = cols; break;
+                    }
+                }
+
+                var keyCols = mi.EqualityColumns.Concat(mi.InequalityColumns).ToList();
+                if (keyCols.Count > 0)
+                {
+                    var create = $"CREATE NONCLUSTERED INDEX [IX_{mi.Table}_{string.Join("_", keyCols.Take(3))}]\nON {mi.Schema}.{mi.Table} ({string.Join(", ", keyCols)})";
+                    if (mi.IncludeColumns.Count > 0)
+                        create += $"\nINCLUDE ({string.Join(", ", mi.IncludeColumns)})";
+                    mi.CreateStatement = create;
+                }
+
+                result.Add(mi);
+            }
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Parse warnings from a parent element that contains a &lt;Warnings&gt; child (e.g. RelOp).
+    /// </summary>
+    private static List<PlanWarning> ParseWarnings(XElement parentEl)
+    {
+        var warningsEl = parentEl.Element(Ns + "Warnings");
+        if (warningsEl == null) return new List<PlanWarning>();
+        return ParseWarningsFromElement(warningsEl);
+    }
+
+    /// <summary>
+    /// Parse warnings directly from a &lt;Warnings&gt; element.
+    /// </summary>
+    private static List<PlanWarning> ParseWarningsFromElement(XElement warningsEl)
+    {
+        var result = new List<PlanWarning>();
+
+        // No join predicate
+        if (warningsEl.Attribute("NoJoinPredicate")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "No Join Predicate",
+                Message = "This join has no join predicate (possible cross join)",
+                Severity = PlanWarningSeverity.Critical
+            });
+        }
+
+        if (warningsEl.Attribute("SpatialGuess")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spatial Guess",
+                Message = "Spatial index selectivity was guessed",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        if (warningsEl.Attribute("UnmatchedIndexes")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Unmatched Indexes",
+                Message = "Indexes could not be matched due to parameterization",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        if (warningsEl.Attribute("FullUpdateForOnlineIndexBuild")?.Value is "true" or "1")
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Full Update for Online Index Build",
+                Message = "Full update required for online index build operation",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        // Spill to TempDb (with enhanced details — Wave 3.7)
+        foreach (var spillEl in warningsEl.Elements(Ns + "SpillToTempDb"))
+        {
+            var spillLevel = spillEl.Attribute("SpillLevel")?.Value ?? "?";
+            var threadCount = spillEl.Attribute("SpilledThreadCount")?.Value ?? "?";
+            var msg = $"Spill level {spillLevel}, {threadCount} thread(s)";
+
+            var grantedKB = ParseLong(spillEl.Attribute("GrantedMemoryKB")?.Value);
+            var usedKB = ParseLong(spillEl.Attribute("UsedMemoryKB")?.Value);
+            var writes = ParseLong(spillEl.Attribute("WritesToTempDb")?.Value);
+            var reads = ParseLong(spillEl.Attribute("ReadsFromTempDb")?.Value);
+            if (grantedKB > 0 || writes > 0)
+            {
+                msg += $" — Granted: {grantedKB:N0} KB, Used: {usedKB:N0} KB";
+                if (writes > 0) msg += $", Writes: {writes:N0}";
+                if (reads > 0) msg += $", Reads: {reads:N0}";
+            }
+
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill to TempDb",
+                Message = msg,
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Sort spill details
+        foreach (var sortSpillEl in warningsEl.Elements(Ns + "SortSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Sort Spill",
+                Message = $"Sort spill — Granted: {ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Sort",
+                    GrantedMemoryKB = ParseLong(sortSpillEl.Attribute("GrantedMemoryKb")?.Value),
+                    UsedMemoryKB = ParseLong(sortSpillEl.Attribute("UsedMemoryKb")?.Value),
+                    WritesToTempDb = ParseLong(sortSpillEl.Attribute("WritesToTempDb")?.Value),
+                    ReadsFromTempDb = ParseLong(sortSpillEl.Attribute("ReadsFromTempDb")?.Value)
+                }
+            });
+        }
+
+        // Hash spill details
+        foreach (var hashSpillEl in warningsEl.Elements(Ns + "HashSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Hash Spill",
+                Message = $"Hash spill — Granted: {ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value):N0} KB, Used: {ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value):N0} KB, Writes: {ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value):N0}, Reads: {ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value):N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Hash",
+                    GrantedMemoryKB = ParseLong(hashSpillEl.Attribute("GrantedMemoryKb")?.Value),
+                    UsedMemoryKB = ParseLong(hashSpillEl.Attribute("UsedMemoryKb")?.Value),
+                    WritesToTempDb = ParseLong(hashSpillEl.Attribute("WritesToTempDb")?.Value),
+                    ReadsFromTempDb = ParseLong(hashSpillEl.Attribute("ReadsFromTempDb")?.Value)
+                }
+            });
+        }
+
+        // Exchange spill details
+        foreach (var exchSpillEl in warningsEl.Elements(Ns + "ExchangeSpillDetails"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Exchange Spill",
+                Message = $"Exchange spill — Writes: {ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value):N0}",
+                Severity = PlanWarningSeverity.Warning,
+                SpillDetails = new SpillDetail
+                {
+                    SpillType = "Exchange",
+                    WritesToTempDb = ParseLong(exchSpillEl.Attribute("WritesToTempDb")?.Value)
+                }
+            });
+        }
+
+        // SpillOccurred
+        var spillOccurredEl = warningsEl.Element(Ns + "SpillOccurred");
+        if (spillOccurredEl != null)
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Spill Occurred",
+                Message = "Spill occurred during execution (from last query plan stats)",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Memory grant warning
+        var memWarnEl = warningsEl.Element(Ns + "MemoryGrantWarning");
+        if (memWarnEl != null)
+        {
+            var kind = memWarnEl.Attribute("GrantWarningKind")?.Value ?? "Unknown";
+            var requested = ParseLong(memWarnEl.Attribute("RequestedMemory")?.Value);
+            var granted = ParseLong(memWarnEl.Attribute("GrantedMemory")?.Value);
+            var maxUsed = ParseLong(memWarnEl.Attribute("MaxUsedMemory")?.Value);
+            result.Add(new PlanWarning
+            {
+                WarningType = "Memory Grant",
+                Message = $"{kind}: Requested {requested:N0} KB, Granted {granted:N0} KB, Used {maxUsed:N0} KB",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Implicit conversions
+        foreach (var convertEl in warningsEl.Elements(Ns + "PlanAffectingConvert"))
+        {
+            var issue = convertEl.Attribute("ConvertIssue")?.Value ?? "Unknown";
+            var expr = convertEl.Attribute("Expression")?.Value ?? "";
+            result.Add(new PlanWarning
+            {
+                WarningType = "Implicit Conversion",
+                Message = $"{issue}: {expr}",
+                Severity = issue.Contains("Cardinality") ? PlanWarningSeverity.Warning : PlanWarningSeverity.Critical
+            });
+        }
+
+        // Columns with no statistics
+        var noStatsEl = warningsEl.Element(Ns + "ColumnsWithNoStatistics");
+        if (noStatsEl != null)
+        {
+            var cols = noStatsEl.Elements(Ns + "ColumnReference")
+                .Select(c => c.Attribute("Column")?.Value ?? "")
+                .Where(s => !string.IsNullOrEmpty(s));
+            result.Add(new PlanWarning
+            {
+                WarningType = "Missing Statistics",
+                Message = $"No statistics on: {string.Join(", ", cols)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Wave 2.3: Columns with stale statistics
+        var staleStatsEl = warningsEl.Element(Ns + "ColumnsWithStaleStatistics");
+        if (staleStatsEl != null)
+        {
+            var cols = staleStatsEl.Elements(Ns + "ColumnReference")
+                .Select(c => c.Attribute("Column")?.Value ?? "")
+                .Where(s => !string.IsNullOrEmpty(s));
+            result.Add(new PlanWarning
+            {
+                WarningType = "Stale Statistics",
+                Message = $"Stale statistics on: {string.Join(", ", cols)}",
+                Severity = PlanWarningSeverity.Warning
+            });
+        }
+
+        // Wait warnings
+        foreach (var waitEl in warningsEl.Elements(Ns + "Wait"))
+        {
+            result.Add(new PlanWarning
+            {
+                WarningType = "Wait",
+                Message = $"{waitEl.Attribute("WaitType")?.Value}: {waitEl.Attribute("WaitTime")?.Value}ms",
+                Severity = PlanWarningSeverity.Info
+            });
+        }
+
+        return result;
+    }
+
+    private static void ComputeOperatorCosts(ParsedPlan plan)
+    {
+        foreach (var batch in plan.Batches)
+        {
+            foreach (var stmt in batch.Statements)
+            {
+                if (stmt.RootNode == null) continue;
+                var totalCost = stmt.StatementSubTreeCost > 0
+                    ? stmt.StatementSubTreeCost
+                    : stmt.RootNode.EstimatedTotalSubtreeCost;
+                if (totalCost <= 0) totalCost = 1;
+                ComputeNodeCosts(stmt.RootNode, totalCost);
+            }
+        }
+    }
+
+    private static void ComputeNodeCosts(PlanNode node, double totalStatementCost)
+    {
+        var childrenSubtreeCost = node.Children.Sum(c => c.EstimatedTotalSubtreeCost);
+        node.EstimatedOperatorCost = Math.Max(0, node.EstimatedTotalSubtreeCost - childrenSubtreeCost);
+        node.CostPercent = (int)Math.Round((node.EstimatedOperatorCost / totalStatementCost) * 100);
+        node.CostPercent = Math.Min(100, Math.Max(0, node.CostPercent));
+
+        foreach (var child in node.Children)
+            ComputeNodeCosts(child, totalStatementCost);
+    }
+
+    private static IEnumerable<XElement> ScopedDescendants(XElement element, XName name)
+    {
+        foreach (var child in element.Elements())
+        {
+            if (child.Name == Ns + "RelOp") continue;
+            if (child.Name == name) yield return child;
+            foreach (var desc in ScopedDescendants(child, name))
+                yield return desc;
+        }
+    }
+
+    private static string? ParseColumnList(XElement parent, string elementName)
+    {
+        var el = parent.Element(Ns + elementName);
+        if (el == null) return null;
+        var cols = el.Elements(Ns + "ColumnReference")
+            .Select(c => FormatColumnRef(c))
+            .Where(s => !string.IsNullOrEmpty(s));
+        var result = string.Join(", ", cols);
+        return string.IsNullOrEmpty(result) ? null : result;
+    }
+
+    private static string FormatColumnRef(XElement colRef)
+    {
+        var col = colRef.Attribute("Column")?.Value ?? "";
+        var tbl = colRef.Attribute("Table")?.Value ?? "";
+        var result = string.IsNullOrEmpty(tbl) ? col : $"{tbl}.{col}";
+        return result.Replace("[", "").Replace("]", "");
+    }
+
+    private static double ParseDouble(string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return 0;
+        return double.TryParse(value, System.Globalization.NumberStyles.Float,
+            System.Globalization.CultureInfo.InvariantCulture, out var result) ? result : 0;
+    }
+
+    private static long ParseLong(string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return 0;
+        return long.TryParse(value, out var result) ? result : 0;
+    }
+}
diff --git a/Lite/Themes/DarkTheme.xaml b/Lite/Themes/DarkTheme.xaml
index f17ce306..ef8ef3d3 100644
--- a/Lite/Themes/DarkTheme.xaml
+++ b/Lite/Themes/DarkTheme.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorLite.Helpers">
 
     <!-- ============================================ -->
     <!-- Darling Data Dark Theme                      -->
@@ -566,6 +567,7 @@
     <!-- DataGrid Style                               -->
     <!-- ============================================ -->
     <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
         <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
         <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
@@ -578,6 +580,22 @@
         <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
         <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderBrush}"/>
         <Setter Property="HeadersVisibility" Value="Column"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <!-- Column header resize gripper -->
+    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Cursor" Value="SizeWE"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <Style TargetType="DataGridColumnHeader">
@@ -588,17 +606,71 @@
         <Setter Property="Padding" Value="8,6"/>
         <Setter Property="FontWeight" Value="SemiBold"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Grid>
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter Grid.Column="0"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="Center"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <Path x:Name="SortArrow"
+                                      Grid.Column="1"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      Width="8" Height="6"
+                                      Margin="4,0,2,0"
+                                      Stretch="Fill"
+                                      Opacity="0.7"
+                                      Fill="{StaticResource ForegroundDimBrush}"
+                                      RenderTransformOrigin="0.5,0.5"
+                                      Visibility="Collapsed"
+                                      Data="M 0,0 L 8,0 L 4,6 Z"/>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper"
+                               HorizontalAlignment="Left"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb x:Name="PART_RightHeaderGripper"
+                               HorizontalAlignment="Right"
+                               Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                            <Setter TargetName="SortArrow" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <!-- Column header style when filter is active - subtle blue highlight -->
-    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader">
+    <Style x:Key="FilteredColumnHeaderStyle" TargetType="DataGridColumnHeader"
+           BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
         <Setter Property="Background" Value="#3D5A80"/>
-        <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="0,0,1,1"/>
-        <Setter Property="Padding" Value="8,6"/>
-        <Setter Property="FontWeight" Value="SemiBold"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+    </Style>
+
+    <!-- Right-aligned text style for numeric DataGrid columns -->
+    <Style x:Key="NumericCell" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+        <Setter Property="TextAlignment" Value="Right"/>
     </Style>
 
     <Style TargetType="DataGridCell">
diff --git a/Lite/Windows/AddServerDialog.xaml b/Lite/Windows/AddServerDialog.xaml
index 376d6f4a..00aa7513 100644
--- a/Lite/Windows/AddServerDialog.xaml
+++ b/Lite/Windows/AddServerDialog.xaml
@@ -96,7 +96,7 @@
 
         <!-- Status -->
         <TextBlock Grid.Row="9" x:Name="StatusText" Foreground="{DynamicResource ForegroundMutedBrush}"
-                   VerticalAlignment="Bottom" Margin="0,0,0,8"/>
+                   TextWrapping="Wrap" VerticalAlignment="Bottom" Margin="0,0,0,8"/>
 
         <!-- Buttons -->
         <StackPanel Grid.Row="10" Orientation="Horizontal" HorizontalAlignment="Right">
diff --git a/Lite/Windows/CollectionLogWindow.xaml b/Lite/Windows/CollectionLogWindow.xaml
new file mode 100644
index 00000000..22b363e7
--- /dev/null
+++ b/Lite/Windows/CollectionLogWindow.xaml
@@ -0,0 +1,93 @@
+<Window x:Class="PerformanceMonitorLite.Windows.CollectionLogWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Collection History" Height="600" Width="1100"
+        WindowStartupLocation="CenterOwner"
+        Background="{StaticResource BackgroundBrush}">
+
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header -->
+        <Border Grid.Row="0" Background="{StaticResource BackgroundLightBrush}" Padding="10" Margin="10,10,10,0" CornerRadius="4">
+            <StackPanel>
+                <TextBlock x:Name="CollectorNameText" FontSize="16" FontWeight="Bold"/>
+                <TextBlock x:Name="SummaryText" Margin="0,5,0,0"/>
+            </StackPanel>
+        </Border>
+
+        <!-- Data Grid -->
+        <DataGrid Grid.Row="1" x:Name="LogDataGrid"
+                  AutoGenerateColumns="False"
+                  IsReadOnly="True"
+                  CanUserSortColumns="True"
+                  HeadersVisibility="Column"
+                  GridLinesVisibility="Horizontal"
+                  Margin="10"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Binding="{Binding CollectionTimeFormatted}" Width="140">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="Collection Time" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding Status}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="Status" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding RowsCollected}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="Rows" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding DurationFormatted}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="Duration" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding SqlDurationFormatted}" ElementStyle="{StaticResource NumericCell}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="SQL Duration" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding DuckDbDurationFormatted}" ElementStyle="{StaticResource NumericCell}" Width="110">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="DuckDB Duration" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding ErrorMessage}" Width="*">
+                    <DataGridTextColumn.Header>
+                        <TextBlock Text="Error Message" FontWeight="Bold"/>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <!-- Footer -->
+        <Border Grid.Row="2" Background="{StaticResource BackgroundLightBrush}" Padding="10" Margin="10,0,10,10" CornerRadius="4">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Content="Close" Width="100" Height="30" Click="Close_Click"/>
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
diff --git a/Lite/Windows/CollectionLogWindow.xaml.cs b/Lite/Windows/CollectionLogWindow.xaml.cs
new file mode 100644
index 00000000..e1e8b730
--- /dev/null
+++ b/Lite/Windows/CollectionLogWindow.xaml.cs
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using PerformanceMonitorLite.Services;
+
+namespace PerformanceMonitorLite.Windows
+{
+    public partial class CollectionLogWindow : Window
+    {
+        private readonly string _collectorName;
+        private readonly LocalDataService _dataService;
+        private readonly int _serverId;
+
+        public CollectionLogWindow(LocalDataService dataService, int serverId, string collectorName)
+        {
+            InitializeComponent();
+
+            _dataService = dataService;
+            _serverId = serverId;
+            _collectorName = collectorName;
+
+            CollectorNameText.Text = $"Collection History: {collectorName}";
+
+            Loaded += CollectionLogWindow_Loaded;
+        }
+
+        private async void CollectionLogWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            await LoadCollectionLogAsync();
+        }
+
+        private async Task LoadCollectionLogAsync()
+        {
+            try
+            {
+                var logs = await _dataService.GetCollectionLogByCollectorAsync(_serverId, _collectorName);
+                LogDataGrid.ItemsSource = logs;
+
+                if (logs.Count > 0)
+                {
+                    var successCount = logs.Count(l => l.Status == "SUCCESS");
+                    var errorCount = logs.Count(l => l.Status == "ERROR");
+                    var avgDuration = logs.Where(l => l.Status == "SUCCESS" && l.DurationMs.HasValue)
+                                           .Select(l => (double)l.DurationMs!.Value)
+                                           .DefaultIfEmpty(0)
+                                           .Average();
+
+                    SummaryText.Text = $"Total Runs: {logs.Count} | Success: {successCount} | Errors: {errorCount} | Avg Duration: {avgDuration:F0} ms";
+                }
+                else
+                {
+                    SummaryText.Text = "No collection history found for this collector.";
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(
+                    $"Failed to load collection history:\n\n{ex.Message}",
+                    "Error",
+                    MessageBoxButton.OK,
+                    MessageBoxImage.Error
+                );
+            }
+        }
+
+        private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
+        private void CopyRow_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyRow(sender);
+        private void CopyAllRows_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyAllRows(sender);
+        private void ExportToCsv_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.ExportToCsv(sender, "collection_log");
+
+        private void Close_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}
diff --git a/Lite/Windows/ManageServersWindow.xaml b/Lite/Windows/ManageServersWindow.xaml
index 4521ac66..422c9a5d 100644
--- a/Lite/Windows/ManageServersWindow.xaml
+++ b/Lite/Windows/ManageServersWindow.xaml
@@ -11,6 +11,13 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Margin="16">
@@ -32,7 +39,8 @@
                   SelectionMode="Single"
                   Background="Transparent" BorderThickness="0"
                   HeadersVisibility="Column" GridLinesVisibility="Horizontal"
-                  MouseDoubleClick="ServersGrid_MouseDoubleClick">
+                  MouseDoubleClick="ServersGrid_MouseDoubleClick"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Display Name" Binding="{Binding DisplayName}" Width="150"/>
                 <DataGridTextColumn Header="Server" Binding="{Binding ServerName}" Width="200"/>
diff --git a/Lite/Windows/ManageServersWindow.xaml.cs b/Lite/Windows/ManageServersWindow.xaml.cs
index 259cdd7c..8ef3447c 100644
--- a/Lite/Windows/ManageServersWindow.xaml.cs
+++ b/Lite/Windows/ManageServersWindow.xaml.cs
@@ -91,6 +91,11 @@ private void DeleteButton_Click(object sender, RoutedEventArgs e)
         }
     }
 
+    private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
+    private void CopyRow_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyRow(sender);
+    private void CopyAllRows_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyAllRows(sender);
+    private void ExportToCsv_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.ExportToCsv(sender, "servers");
+
     private void CloseButton_Click(object sender, RoutedEventArgs e)
     {
         Close();
diff --git a/Lite/Windows/ProcedureHistoryWindow.xaml b/Lite/Windows/ProcedureHistoryWindow.xaml
index bc9bb75f..4836ead1 100644
--- a/Lite/Windows/ProcedureHistoryWindow.xaml
+++ b/Lite/Windows/ProcedureHistoryWindow.xaml
@@ -7,7 +7,18 @@
         Background="{StaticResource BackgroundBrush}">
 
     <Window.Resources>
-        <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
+        </ResourceDictionary>
     </Window.Resources>
 
     <Grid Margin="10">
@@ -39,6 +50,7 @@
                     <ComboBoxItem Content="Execution Count Delta" Tag="DeltaExecutions"/>
                     <ComboBoxItem Content="Total CPU (ms)" Tag="DeltaCpuMs"/>
                     <ComboBoxItem Content="Total Logical Reads" Tag="DeltaLogicalReads"/>
+                    <ComboBoxItem Content="Total Spills" Tag="TotalSpills"/>
                 </ComboBox>
                 <scottplot:WpfPlot x:Name="HistoryChart" Margin="0,0,0,0"/>
             </Grid>
@@ -48,18 +60,24 @@
         <DataGrid Grid.Row="2" x:Name="HistoryDataGrid" Margin="0,10,0,0"
                   AutoGenerateColumns="False" IsReadOnly="True"
                   CanUserSortColumns="True" CanUserReorderColumns="True"
-                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Collection Time" Binding="{Binding CollectionTimeLocal}" Width="130"/>
-                <DataGridTextColumn Header="Exec Delta" Binding="{Binding DeltaExecutions, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="CPU Delta (ms)" Binding="{Binding DeltaCpuMs, StringFormat=N1}" Width="110"/>
-                <DataGridTextColumn Header="Duration Delta (ms)" Binding="{Binding DeltaElapsedMs, StringFormat=N1}" Width="130"/>
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgElapsedMs, StringFormat=N2}" Width="120"/>
-                <DataGridTextColumn Header="Logical Reads" Binding="{Binding DeltaLogicalReads, StringFormat=N0}" Width="100"/>
-                <DataGridTextColumn Header="Avg Reads" Binding="{Binding AvgReads, StringFormat=N1}" Width="90"/>
-                <DataGridTextColumn Header="Writes" Binding="{Binding DeltaLogicalWrites, StringFormat=N0}" Width="80"/>
-                <DataGridTextColumn Header="Physical Reads" Binding="{Binding DeltaPhysicalReads, StringFormat=N0}" Width="100"/>
+                <DataGridTextColumn Header="Exec Delta" Binding="{Binding DeltaExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="CPU Delta (ms)" Binding="{Binding DeltaCpuMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="110"/>
+                <DataGridTextColumn Header="Duration Delta (ms)" Binding="{Binding DeltaElapsedMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="130"/>
+                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
+                <DataGridTextColumn Header="Logical Reads" Binding="{Binding DeltaLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Avg Reads" Binding="{Binding AvgReads, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="Writes" Binding="{Binding DeltaLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80"/>
+                <DataGridTextColumn Header="Physical Reads" Binding="{Binding DeltaPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Spills" Binding="{Binding TotalSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="70"/>
+                <DataGridTextColumn Header="Min CPU (ms)" Binding="{Binding MinCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Max CPU (ms)" Binding="{Binding MaxCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Min Duration (ms)" Binding="{Binding MinElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
+                <DataGridTextColumn Header="Max Duration (ms)" Binding="{Binding MaxElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
                 <DataGridTemplateColumn Header="Plan" Width="Auto" MinWidth="80">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
diff --git a/Lite/Windows/ProcedureHistoryWindow.xaml.cs b/Lite/Windows/ProcedureHistoryWindow.xaml.cs
index 3cb45212..cf7948b1 100644
--- a/Lite/Windows/ProcedureHistoryWindow.xaml.cs
+++ b/Lite/Windows/ProcedureHistoryWindow.xaml.cs
@@ -171,5 +171,10 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         }
     }
 
+    private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
+    private void CopyRow_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyRow(sender);
+    private void CopyAllRows_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyAllRows(sender);
+    private void ExportToCsv_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.ExportToCsv(sender, "procedure_history");
+
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
 }
diff --git a/Lite/Windows/QueryStatsHistoryWindow.xaml b/Lite/Windows/QueryStatsHistoryWindow.xaml
index bdec4d90..9f44edd3 100644
--- a/Lite/Windows/QueryStatsHistoryWindow.xaml
+++ b/Lite/Windows/QueryStatsHistoryWindow.xaml
@@ -7,7 +7,18 @@
         Background="{StaticResource BackgroundBrush}">
 
     <Window.Resources>
-        <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
+        </ResourceDictionary>
     </Window.Resources>
 
     <Grid Margin="10">
@@ -49,24 +60,25 @@
         <DataGrid Grid.Row="2" x:Name="HistoryDataGrid" Margin="0,10,0,0"
                   AutoGenerateColumns="False" IsReadOnly="True"
                   CanUserSortColumns="True" CanUserReorderColumns="True"
-                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Collection Time" Binding="{Binding CollectionTimeLocal}" Width="130"/>
-                <DataGridTextColumn Header="Exec Delta" Binding="{Binding DeltaExecutions, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="CPU Delta (ms)" Binding="{Binding DeltaCpuMs, StringFormat=N1}" Width="110"/>
-                <DataGridTextColumn Header="Duration Delta (ms)" Binding="{Binding DeltaElapsedMs, StringFormat=N1}" Width="130"/>
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgElapsedMs, StringFormat=N2}" Width="120"/>
-                <DataGridTextColumn Header="Logical Reads" Binding="{Binding DeltaLogicalReads, StringFormat=N0}" Width="100"/>
-                <DataGridTextColumn Header="Avg Reads" Binding="{Binding AvgReads, StringFormat=N1}" Width="90"/>
-                <DataGridTextColumn Header="Rows" Binding="{Binding DeltaRows, StringFormat=N0}" Width="80"/>
-                <DataGridTextColumn Header="Writes" Binding="{Binding DeltaLogicalWrites, StringFormat=N0}" Width="80"/>
-                <DataGridTextColumn Header="Physical Reads" Binding="{Binding DeltaPhysicalReads, StringFormat=N0}" Width="100"/>
-                <DataGridTextColumn Header="Spills" Binding="{Binding DeltaSpills, StringFormat=N0}" Width="70"/>
-                <DataGridTextColumn Header="Min CPU (ms)" Binding="{Binding MinCpuMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Max CPU (ms)" Binding="{Binding MaxCpuMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Min Duration (ms)" Binding="{Binding MinElapsedMs, StringFormat=N2}" Width="120"/>
-                <DataGridTextColumn Header="Max Duration (ms)" Binding="{Binding MaxElapsedMs, StringFormat=N2}" Width="120"/>
+                <DataGridTextColumn Header="Exec Delta" Binding="{Binding DeltaExecutions, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="CPU Delta (ms)" Binding="{Binding DeltaCpuMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="110"/>
+                <DataGridTextColumn Header="Duration Delta (ms)" Binding="{Binding DeltaElapsedMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="130"/>
+                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
+                <DataGridTextColumn Header="Logical Reads" Binding="{Binding DeltaLogicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Avg Reads" Binding="{Binding AvgReads, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="Rows" Binding="{Binding DeltaRows, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80"/>
+                <DataGridTextColumn Header="Writes" Binding="{Binding DeltaLogicalWrites, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="80"/>
+                <DataGridTextColumn Header="Physical Reads" Binding="{Binding DeltaPhysicalReads, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Spills" Binding="{Binding DeltaSpills, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="70"/>
+                <DataGridTextColumn Header="Min CPU (ms)" Binding="{Binding MinCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Max CPU (ms)" Binding="{Binding MaxCpuMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Min Duration (ms)" Binding="{Binding MinElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
+                <DataGridTextColumn Header="Max Duration (ms)" Binding="{Binding MaxElapsedMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
                 <DataGridTextColumn Header="Min DOP" Binding="{Binding MinDop}" Width="70"/>
                 <DataGridTextColumn Header="Max DOP" Binding="{Binding MaxDop}" Width="70"/>
                 <DataGridTextColumn Header="Plan Hash" Binding="{Binding QueryPlanHash}" Width="140"/>
diff --git a/Lite/Windows/QueryStatsHistoryWindow.xaml.cs b/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
index 69e54338..709e1470 100644
--- a/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
+++ b/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
@@ -119,16 +119,35 @@ private void UpdateChart()
     private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
     {
         if (sender is not Button btn) return;
-        if (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(_queryHash)) return;
+        if (string.IsNullOrEmpty(_queryHash)) return;
 
         btn.IsEnabled = false;
         btn.Content = "...";
         try
         {
-            var plan = await LocalDataService.FetchQueryPlanOnDemandAsync(_connectionString, _queryHash);
+            string? plan = null;
+            var source = "collected data";
+
+            // Try DuckDB first — plan may already be cached from collection
+            try
+            {
+                plan = await _dataService.GetCachedQueryPlanAsync(_serverId, _queryHash);
+            }
+            catch
+            {
+                // DuckDB lookup failed, fall through to live server
+            }
+
+            // Fall back to live server if DuckDB didn't have it
+            if (string.IsNullOrEmpty(plan) && !string.IsNullOrEmpty(_connectionString))
+            {
+                plan = await LocalDataService.FetchQueryPlanOnDemandAsync(_connectionString, _queryHash);
+                source = "live server";
+            }
+
             if (string.IsNullOrEmpty(plan))
             {
-                MessageBox.Show("No query plan found in the plan cache for this query hash. The plan may have been evicted.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show("No query plan found in collected data or the live plan cache for this query hash.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
 
@@ -141,6 +160,8 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
 
             if (dialog.ShowDialog() != true) return;
             File.WriteAllText(dialog.FileName, plan, Encoding.UTF8);
+            btn.Content = $"Saved ({source})";
+            return;
         }
         catch (Exception ex)
         {
@@ -148,7 +169,8 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         }
         finally
         {
-            btn.Content = "Download";
+            if (btn.Content is "...")
+                btn.Content = "Download";
             btn.IsEnabled = true;
         }
     }
@@ -169,5 +191,10 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
         chart.Plot.Axes.Left.TickLabelStyle.ForeColor = text;
     }
 
+    private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
+    private void CopyRow_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyRow(sender);
+    private void CopyAllRows_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyAllRows(sender);
+    private void ExportToCsv_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.ExportToCsv(sender, "query_stats_history");
+
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
 }
diff --git a/Lite/Windows/QueryStoreHistoryWindow.xaml b/Lite/Windows/QueryStoreHistoryWindow.xaml
index be30f15e..cd5cb7c7 100644
--- a/Lite/Windows/QueryStoreHistoryWindow.xaml
+++ b/Lite/Windows/QueryStoreHistoryWindow.xaml
@@ -7,7 +7,18 @@
         Background="{StaticResource BackgroundBrush}">
 
     <Window.Resources>
-        <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
+        </ResourceDictionary>
     </Window.Resources>
 
     <Grid Margin="10">
@@ -49,19 +60,22 @@
         <DataGrid Grid.Row="2" x:Name="HistoryDataGrid" Margin="0,10,0,0"
                   AutoGenerateColumns="False" IsReadOnly="True"
                   CanUserSortColumns="True" CanUserReorderColumns="True"
-                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                  HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
+                  ContextMenu="{StaticResource DataGridContextMenu}">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Collection Time" Binding="{Binding CollectionTimeLocal}" Width="130"/>
-                <DataGridTextColumn Header="Executions" Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Total Duration (ms)" Binding="{Binding TotalDurationMs, StringFormat=N1}" Width="130"/>
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgDurationMs, StringFormat=N2}" Width="120"/>
-                <DataGridTextColumn Header="Total CPU (ms)" Binding="{Binding TotalCpuMs, StringFormat=N1}" Width="110"/>
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Avg Reads" Binding="{Binding AvgLogicalReads, StringFormat=N1}" Width="90"/>
-                <DataGridTextColumn Header="Avg Writes" Binding="{Binding AvgLogicalWrites, StringFormat=N1}" Width="90"/>
-                <DataGridTextColumn Header="Avg Physical Reads" Binding="{Binding AvgPhysicalReads, StringFormat=N1}" Width="120"/>
-                <DataGridTextColumn Header="Avg Rows" Binding="{Binding AvgRowcount, StringFormat=N1}" Width="90"/>
+                <DataGridTextColumn Header="Executions" Binding="{Binding ExecutionCount, StringFormat=N0}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="Total Duration (ms)" Binding="{Binding TotalDurationMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="130"/>
+                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgDurationMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
+                <DataGridTextColumn Header="Total CPU (ms)" Binding="{Binding TotalCpuMs, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="110"/>
+                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" ElementStyle="{StaticResource NumericCell}" Width="100"/>
+                <DataGridTextColumn Header="Avg Reads" Binding="{Binding AvgLogicalReads, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="Avg Writes" Binding="{Binding AvgLogicalWrites, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
+                <DataGridTextColumn Header="Avg Physical Reads" Binding="{Binding AvgPhysicalReads, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="120"/>
+                <DataGridTextColumn Header="Avg Rows" Binding="{Binding AvgRowcount, StringFormat=N1}" ElementStyle="{StaticResource NumericCell}" Width="90"/>
                 <DataGridTextColumn Header="Last Execution" Binding="{Binding LastExecutionTimeLocal}" Width="130"/>
+                <DataGridTextColumn Header="Min DOP" Binding="{Binding MinDop}" Width="70"/>
+                <DataGridTextColumn Header="Max DOP" Binding="{Binding MaxDop}" Width="70"/>
                 <DataGridTemplateColumn Header="Plan" Width="Auto" MinWidth="80">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
diff --git a/Lite/Windows/QueryStoreHistoryWindow.xaml.cs b/Lite/Windows/QueryStoreHistoryWindow.xaml.cs
index 63a1a50f..99ad5a49 100644
--- a/Lite/Windows/QueryStoreHistoryWindow.xaml.cs
+++ b/Lite/Windows/QueryStoreHistoryWindow.xaml.cs
@@ -172,5 +172,10 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
         chart.Plot.Axes.Left.TickLabelStyle.ForeColor = text;
     }
 
+    private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
+    private void CopyRow_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyRow(sender);
+    private void CopyAllRows_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyAllRows(sender);
+    private void ExportToCsv_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.ExportToCsv(sender, "query_store_history");
+
     private void Close_Click(object sender, RoutedEventArgs e) => Close();
 }
diff --git a/Lite/Windows/SettingsWindow.xaml b/Lite/Windows/SettingsWindow.xaml
index 63686803..934b4a0d 100644
--- a/Lite/Windows/SettingsWindow.xaml
+++ b/Lite/Windows/SettingsWindow.xaml
@@ -13,6 +13,13 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Themes/DarkTheme.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <ContextMenu x:Key="DataGridContextMenu">
+                <MenuItem Header="Copy Cell" Click="CopyCell_Click"/>
+                <MenuItem Header="Copy Row" Click="CopyRow_Click"/>
+                <MenuItem Header="Copy All Rows" Click="CopyAllRows_Click"/>
+                <Separator/>
+                <MenuItem Header="Export to CSV..." Click="ExportToCsv_Click"/>
+            </ContextMenu>
         </ResourceDictionary>
     </Window.Resources>
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
@@ -90,6 +97,26 @@
                         <ComboBoxItem Content="Last 7 days"/>
                     </ComboBox>
                 </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                    <TextBlock Text="Connection timeout:" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,8,0"/>
+                    <TextBox x:Name="ConnectionTimeoutBox" Width="50" Text="5" VerticalAlignment="Center"/>
+                    <TextBlock Text="seconds (5–60, increase for VPN/remote connections)"
+                               FontSize="11" FontStyle="Italic" Foreground="{DynamicResource ForegroundMutedBrush}"
+                               VerticalAlignment="Center" Margin="6,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+                    <TextBlock Text="CSV separator:" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,8,0"/>
+                    <ComboBox x:Name="CsvSeparatorCombo" Width="140" VerticalAlignment="Center">
+                        <ComboBoxItem Content="Comma (,)" Tag=","/>
+                        <ComboBoxItem Content="Semicolon (;)" Tag=";"/>
+                        <ComboBoxItem Content="Tab" Tag="&#x9;"/>
+                    </ComboBox>
+                    <TextBlock Text="auto-detected from locale"
+                               FontSize="11" FontStyle="Italic" Foreground="{DynamicResource ForegroundMutedBrush}"
+                               VerticalAlignment="Center" Margin="6,0,0,0" x:Name="CsvSeparatorHint"/>
+                </StackPanel>
             </StackPanel>
         </Border>
 
@@ -237,7 +264,8 @@
                       CanUserAddRows="False" CanUserDeleteRows="False"
                       SelectionMode="Single"
                       Background="Transparent" BorderThickness="0"
-                      HeadersVisibility="Column" GridLinesVisibility="Horizontal">
+                      HeadersVisibility="Column" GridLinesVisibility="Horizontal"
+                      ContextMenu="{StaticResource DataGridContextMenu}">
                 <DataGrid.Columns>
                     <DataGridCheckBoxColumn Header="Enabled" Binding="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}" Width="65"/>
                     <DataGridTextColumn Header="Collector" Binding="{Binding Name}" Width="160" IsReadOnly="True"/>
diff --git a/Lite/Windows/SettingsWindow.xaml.cs b/Lite/Windows/SettingsWindow.xaml.cs
index 7e52f9bf..2fd865b4 100644
--- a/Lite/Windows/SettingsWindow.xaml.cs
+++ b/Lite/Windows/SettingsWindow.xaml.cs
@@ -11,6 +11,7 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Windows;
+using System.Windows.Controls;
 using PerformanceMonitorLite.Mcp;
 using PerformanceMonitorLite.Services;
 
@@ -37,6 +38,8 @@ public SettingsWindow(
         LoadMcpSettings();
         UpdateMcpStatus();
         LoadDefaultTimeRange();
+        LoadConnectionTimeout();
+        LoadCsvSeparator();
         LoadAlertSettings();
         LoadSmtpSettings();
     }
@@ -108,6 +111,8 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
         _scheduleManager.SaveSchedules();
         bool mcpChanged = SaveMcpSettings();
         SaveDefaultTimeRange();
+        SaveConnectionTimeout();
+        SaveCsvSeparator();
         SaveAlertSettings();
         SaveSmtpSettings();
 
@@ -219,6 +224,89 @@ private void CopyMcpCommandButton_Click(object sender, RoutedEventArgs e)
         McpStatusText.Text = "Copied to clipboard!";
     }
 
+    private void LoadConnectionTimeout()
+    {
+        ConnectionTimeoutBox.Text = App.ConnectionTimeoutSeconds.ToString();
+    }
+
+    private void SaveConnectionTimeout()
+    {
+        if (int.TryParse(ConnectionTimeoutBox.Text, out var timeout) && timeout >= 5 && timeout <= 60)
+        {
+            App.ConnectionTimeoutSeconds = timeout;
+        }
+
+        var settingsPath = Path.Combine(App.ConfigDirectory, "settings.json");
+        try
+        {
+            JsonNode? root;
+            if (File.Exists(settingsPath))
+            {
+                var json = File.ReadAllText(settingsPath);
+                root = JsonNode.Parse(json) ?? new JsonObject();
+            }
+            else
+            {
+                root = new JsonObject();
+            }
+
+            root["connection_timeout_seconds"] = App.ConnectionTimeoutSeconds;
+
+            var options = new JsonSerializerOptions { WriteIndented = true };
+            File.WriteAllText(settingsPath, root.ToJsonString(options));
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("Settings", $"Failed to save connection timeout: {ex.Message}");
+        }
+    }
+
+    private void LoadCsvSeparator()
+    {
+        foreach (ComboBoxItem item in CsvSeparatorCombo.Items)
+        {
+            if (item.Tag?.ToString() == App.CsvSeparator)
+            {
+                CsvSeparatorCombo.SelectedItem = item;
+                break;
+            }
+        }
+        if (CsvSeparatorCombo.SelectedItem == null)
+            CsvSeparatorCombo.SelectedIndex = 0;
+    }
+
+    private void SaveCsvSeparator()
+    {
+        if (CsvSeparatorCombo.SelectedItem is ComboBoxItem selected && selected.Tag is string sep)
+        {
+            App.CsvSeparator = sep;
+        }
+
+        var settingsPath = Path.Combine(App.ConfigDirectory, "settings.json");
+        try
+        {
+            JsonNode? root;
+            if (File.Exists(settingsPath))
+            {
+                var json = File.ReadAllText(settingsPath);
+                root = JsonNode.Parse(json) ?? new JsonObject();
+            }
+            else
+            {
+                root = new JsonObject();
+            }
+
+            root["csv_separator"] = App.CsvSeparator;
+
+            var options = new JsonSerializerOptions { WriteIndented = true };
+            File.WriteAllText(settingsPath, root.ToJsonString(options));
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Error("Settings", $"Failed to save CSV separator: {ex.Message}");
+        }
+    }
+
     private void LoadAlertSettings()
     {
         MinimizeToTrayCheckBox.IsChecked = App.MinimizeToTray;
@@ -525,6 +613,11 @@ private async void TestEmailButton_Click(object sender, RoutedEventArgs e)
         }
     }
 
+    private void CopyCell_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyCell(sender);
+    private void CopyRow_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyRow(sender);
+    private void CopyAllRows_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.CopyAllRows(sender);
+    private void ExportToCsv_Click(object sender, RoutedEventArgs e) => Helpers.ContextMenuHelper.ExportToCsv(sender, "schedules");
+
     private void CloseButton_Click(object sender, RoutedEventArgs e)
     {
         Close();
diff --git a/README.md b/README.md
index 3562944b..d3ddb75e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@ Free, open-source SQL Server performance monitoring in two editions. Built for D
 
 **Supported SQL Servers:** SQL Server 2016, 2017, 2019, 2022, 2025 | Azure SQL Managed Instance | AWS RDS for SQL Server | Azure SQL Database (Lite only)
 
-**Dashboard/Lite requires:** Windows 10 or later, Windows Server 2016 or later
+**Dashboard/Lite requires:** Windows 10 or later, Windows Server 2016 or later | [.NET 8 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+
+**Download ready-to-run executables from the [Releases page](https://github.com/erikdarlingdata/PerformanceMonitor/releases).** No build steps required — download the `.zip` for the edition you want, extract it to any folder, and run the `.exe` inside. See [Getting Started](#getting-started) for setup details.
 
 ---
 
@@ -95,6 +97,19 @@ A single WPF desktop application that monitors SQL Server instances remotely. Qu
 
 ---
 
+## Getting Started
+
+1. Install the [.NET 8 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) if you don't already have it (look for ".NET Desktop Runtime 8.0.x" — not the ASP.NET Core or Server runtime)
+2. Go to the [Releases page](https://github.com/erikdarlingdata/PerformanceMonitor/releases) and download the `.zip` for the edition you want:
+   - **`PerformanceMonitorLite`** — standalone desktop app, no server install needed
+   - **`PerformanceMonitorInstaller`** — sets up the PerformanceMonitor database and SQL Agent jobs on your server
+   - **`PerformanceMonitorDashboard`** — desktop app that connects to the database created by the Installer
+3. Extract the `.zip` to any folder and run the `.exe` inside
+
+For the **Full Edition**, run the Installer first (see below), then open the Dashboard. For the **Lite Edition**, just run the app — no installation step required.
+
+---
+
 ## Quick Start — Full Edition
 
 ### Install
@@ -167,7 +182,7 @@ ORDER BY collection_time DESC;
 
 ### Data Retention
 
-Default: 30 days (configurable per table in `config.retention_settings`).
+Default: 30 days (configurable per collector via `retention_days` in `config.collection_schedule`).
 
 Storage estimates: 5-10 GB per week, 20-40 GB per month.
 
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index f8aa0677..f5e6328f 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -123,6 +123,42 @@ If you have concerns about GPLv3 compatibility in your environment, you can:
 
 ---
 
+## vscode-mssql (Execution Plan Icons)
+
+**Author**: Microsoft Corporation
+**Repository**: https://github.com/microsoft/vscode-mssql
+**License**: MIT License
+
+Execution plan operator icons (PNG) from the vscode-mssql extension are used in the Plan Viewer feature.
+
+### License Text
+
+MIT License
+
+Copyright (c) Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Full license: https://github.com/microsoft/vscode-mssql/blob/main/LICENSE
+
+---
+
 ## Acknowledgments
 
 Performance Monitor would not be possible without the excellent work of:
@@ -131,8 +167,10 @@ Performance Monitor would not be possible without the excellent work of:
 - **Erik Darling** for DarlingData tools that provide deep system health and blocking analysis
 - **Brent Ozar Unlimited** for the First Responder Kit and comprehensive SQL Server diagnostics
 
+- **Microsoft** for vscode-mssql execution plan operator icons used in the Plan Viewer
+
 We are grateful for their contributions to the SQL Server community and their commitment to open-source software.
 
 ---
 
-*Last Updated: January 2, 2025*
+*Last Updated: February 19, 2026*
diff --git a/install/02_create_tables.sql b/install/02_create_tables.sql
index c053fcab..9907bc09 100644
--- a/install/02_create_tables.sql
+++ b/install/02_create_tables.sql
@@ -18,6 +18,15 @@ GO
 USE PerformanceMonitor;
 GO
 
+/*
+Cleanup: session_wait_stats removed in v1.4
+*/
+IF OBJECT_ID(N'report.session_wait_analysis', N'V') IS NOT NULL DROP VIEW report.session_wait_analysis;
+IF OBJECT_ID(N'collect.session_wait_stats_collector', N'P') IS NOT NULL DROP PROCEDURE collect.session_wait_stats_collector;
+IF OBJECT_ID(N'collect.session_wait_stats', N'U') IS NOT NULL DROP TABLE collect.session_wait_stats;
+IF OBJECT_ID(N'config.collection_schedule', N'U') IS NOT NULL DELETE FROM config.collection_schedule WHERE collector_name = N'session_wait_stats_collector';
+GO
+
 /*
 Collection tables for the 7 core collectors
 */
@@ -681,6 +690,7 @@ BEGIN
     (
         collection_id bigint IDENTITY NOT NULL,
         collection_time datetime2(7) NOT NULL DEFAULT SYSDATETIME(),
+        server_start_time datetime2(7) NOT NULL,
         resource_semaphore_id smallint NOT NULL,
         pool_id integer NOT NULL,
         target_memory_mb decimal(19,2) NULL,
@@ -693,16 +703,15 @@ BEGIN
         waiter_count integer NULL,
         timeout_error_count bigint NULL,
         forced_grant_count bigint NULL,
-        /*Pressure warnings*/
-        available_memory_pressure_warning bit NULL,
-        waiter_count_warning bit NULL,
-        timeout_error_warning bit NULL,
-        forced_grant_warning bit NULL,
-        CONSTRAINT 
-        PK_memory_grant_stats 
-        PRIMARY KEY CLUSTERED 
-            (collection_time, collection_id) 
-        WITH 
+        /*Delta columns calculated by framework*/
+        timeout_error_count_delta bigint NULL,
+        forced_grant_count_delta bigint NULL,
+        sample_interval_seconds integer NULL,
+        CONSTRAINT
+        PK_memory_grant_stats
+        PRIMARY KEY CLUSTERED
+            (collection_time, collection_id)
+        WITH
             (DATA_COMPRESSION = PAGE)
     );
 
@@ -1277,49 +1286,6 @@ BEGIN
     PRINT 'Created collect.waiting_tasks table';
 END;
 
-/*
-Table: collect.session_wait_stats
-Purpose: Captures per-session wait statistics from sys.dm_exec_session_wait_stats
-Collection Frequency: Every 60 seconds (alongside query snapshots)
-Type: Snapshot (resets on session end)
-Dependencies: None
-Notes: Correlates with query_snapshots to show waits for specific sessions
-       Requires SQL Server 2016 SP1 or later
-*/
-IF OBJECT_ID(N'collect.session_wait_stats', N'U') IS NULL
-BEGIN
-    CREATE TABLE
-        collect.session_wait_stats
-    (
-        collection_id bigint IDENTITY NOT NULL,
-        collection_time datetime2(7) NOT NULL
-            DEFAULT SYSDATETIME(),
-        session_id integer NOT NULL,
-        wait_type nvarchar(60) NOT NULL,
-        waiting_tasks_count bigint NOT NULL,
-        wait_time_ms bigint NOT NULL,
-        max_wait_time_ms bigint NOT NULL,
-        signal_wait_time_ms bigint NOT NULL,
-        /*Session context for correlation*/
-        database_id integer NULL,
-        database_name sysname NULL,
-        login_name nvarchar(128) NULL,
-        host_name nvarchar(128) NULL,
-        program_name nvarchar(128) NULL,
-        /*Query context if executing*/
-        sql_handle varbinary(64) NULL,
-        query_text nvarchar(max) NULL,
-        CONSTRAINT
-            PK_session_wait_stats
-        PRIMARY KEY CLUSTERED
-            (collection_time, collection_id)
-        WITH
-            (DATA_COMPRESSION = PAGE)
-    );
-
-    PRINT 'Created collect.session_wait_stats table';
-END;
-
 /*
 Running Jobs Monitor (Point-in-Time Snapshot)
 Captures currently running SQL Agent jobs with historical duration comparison
diff --git a/install/03_create_config_tables.sql b/install/03_create_config_tables.sql
index aec89f1f..6fdb40d4 100644
--- a/install/03_create_config_tables.sql
+++ b/install/03_create_config_tables.sql
@@ -202,7 +202,6 @@ BEGIN
                 (N'plan_cache_stats_collector', 1, 60, 5, 30, N'Plan cache composition statistics - single-use plans and plan cache bloat detection'),
                 (N'session_stats_collector', 1, 5, 2, 30, N'Session and connection statistics - connection leaks and application patterns'),
                 (N'waiting_tasks_collector', 1, 5, 2, 30, N'Currently waiting tasks - blocking chains and wait analysis'),
-                (N'session_wait_stats_collector', 1, 1, 2, 30, N'Per-session wait statistics - correlates waits with specific sessions/queries (requires SQL Server 2016 SP1+)'),
                 (N'running_jobs_collector', 1, 5, 2, 7, N'Currently running SQL Agent jobs with historical duration comparison');
 
             /*
diff --git a/install/04_create_schedule_table.sql b/install/04_create_schedule_table.sql
index d73c13b4..fa4e6390 100644
--- a/install/04_create_schedule_table.sql
+++ b/install/04_create_schedule_table.sql
@@ -74,7 +74,6 @@ FROM
     (N'plan_cache_stats_collector', 1, 5, 5, 30, N'Plan cache composition statistics - single-use plans and plan cache bloat detection'),
     (N'session_stats_collector', 1, 1, 2, 30, N'Session and connection statistics - connection leaks and application patterns'),
     (N'waiting_tasks_collector', 1, 1, 2, 30, N'Currently waiting tasks - blocking chains and wait analysis'),
-    (N'session_wait_stats_collector', 1, 1, 2, 30, N'Per-session wait statistics - correlates waits with specific sessions/queries (requires SQL Server 2016 SP1+)'),
     (N'running_jobs_collector', 1, 1, 2, 7, N'Currently running SQL Agent jobs with historical duration comparison')
 ) AS v (collector_name, enabled, frequency_minutes, max_duration_minutes, retention_days, description)
 WHERE NOT EXISTS
diff --git a/install/05_delta_framework.sql b/install/05_delta_framework.sql
index e184e705..b0e87b28 100644
--- a/install/05_delta_framework.sql
+++ b/install/05_delta_framework.sql
@@ -1065,6 +1065,90 @@ BEGIN
             OPTION(RECOMPILE, HASH JOIN, HASH GROUP);';
         END;
 
+        /*
+        Memory Grant Stats Delta Calculation
+        */
+        ELSE IF @table_name = N'memory_grant_stats'
+        BEGIN
+            SET @sql = N'
+            WITH
+                current_collection AS
+            (
+                SELECT
+                    mgs.*,
+                    row_number =
+                        ROW_NUMBER() OVER
+                        (
+                            PARTITION BY
+                                mgs.resource_semaphore_id,
+                                mgs.pool_id
+                            ORDER BY
+                                mgs.collection_time DESC
+                        )
+                FROM collect.memory_grant_stats AS mgs
+                WHERE mgs.timeout_error_count_delta IS NULL
+            ),
+                previous_collection AS
+            (
+                SELECT
+                    mgs.collection_id,
+                    mgs.resource_semaphore_id,
+                    mgs.pool_id,
+                    mgs.timeout_error_count,
+                    mgs.forced_grant_count,
+                    mgs.collection_time,
+                    row_number =
+                        ROW_NUMBER() OVER
+                        (
+                            PARTITION BY
+                                mgs.resource_semaphore_id,
+                                mgs.pool_id
+                            ORDER BY
+                                mgs.collection_time DESC
+                        )
+                FROM collect.memory_grant_stats AS mgs
+                WHERE mgs.timeout_error_count_delta IS NOT NULL
+                OR    mgs.collection_id IN
+                (
+                    SELECT
+                        MIN(mgs2.collection_id)
+                    FROM collect.memory_grant_stats AS mgs2
+                    GROUP BY
+                        mgs2.resource_semaphore_id,
+                        mgs2.pool_id
+                )
+            )
+            UPDATE
+                cc
+            SET
+                timeout_error_count_delta =
+                    CASE
+                        WHEN cc.server_start_time >= pc.collection_time
+                        THEN cc.timeout_error_count /*Server restart*/
+                        WHEN cc.timeout_error_count >= pc.timeout_error_count
+                        THEN cc.timeout_error_count - pc.timeout_error_count
+                        ELSE cc.timeout_error_count /*Counter wrapped or restart*/
+                    END,
+                forced_grant_count_delta =
+                    CASE
+                        WHEN cc.server_start_time >= pc.collection_time
+                        THEN cc.forced_grant_count /*Server restart*/
+                        WHEN cc.forced_grant_count >= pc.forced_grant_count
+                        THEN cc.forced_grant_count - pc.forced_grant_count
+                        ELSE cc.forced_grant_count /*Counter wrapped or restart*/
+                    END,
+                sample_interval_seconds =
+                    DATEDIFF(SECOND, pc.collection_time, cc.collection_time)
+            FROM current_collection AS cc
+            LEFT JOIN previous_collection AS pc
+              ON  cc.resource_semaphore_id = pc.resource_semaphore_id
+              AND cc.pool_id = pc.pool_id
+              AND pc.row_number = 1
+            WHERE cc.row_number = 1
+            AND   pc.collection_id IS NOT NULL /*Exclude first collection where no previous exists*/
+            OPTION(RECOMPILE, HASH JOIN, HASH GROUP);';
+        END;
+
         ELSE
         BEGIN
             RAISERROR(N'Unknown table name for delta calculation: %s', 16, 1, @table_name);
diff --git a/install/06_ensure_collection_table.sql b/install/06_ensure_collection_table.sql
index 0b7a9407..fd0a2c8a 100644
--- a/install/06_ensure_collection_table.sql
+++ b/install/06_ensure_collection_table.sql
@@ -671,6 +671,7 @@ BEGIN
     (
         collection_id bigint IDENTITY NOT NULL,
         collection_time datetime2(7) NOT NULL DEFAULT SYSDATETIME(),
+        server_start_time datetime2(7) NOT NULL,
         resource_semaphore_id smallint NOT NULL,
         pool_id integer NOT NULL,
         target_memory_mb decimal(19,2) NULL,
@@ -683,16 +684,15 @@ BEGIN
         waiter_count integer NULL,
         timeout_error_count bigint NULL,
         forced_grant_count bigint NULL,
-        /*Pressure warnings*/
-        available_memory_pressure_warning bit NULL,
-        waiter_count_warning bit NULL,
-        timeout_error_warning bit NULL,
-        forced_grant_warning bit NULL,
-        CONSTRAINT 
-        PK_memory_grant_stats 
-        PRIMARY KEY CLUSTERED 
-            (collection_time, collection_id) 
-        WITH 
+        /*Delta columns calculated by framework*/
+        timeout_error_count_delta bigint NULL,
+        forced_grant_count_delta bigint NULL,
+        sample_interval_seconds integer NULL,
+        CONSTRAINT
+        PK_memory_grant_stats
+        PRIMARY KEY CLUSTERED
+            (collection_time, collection_id)
+        WITH
             (DATA_COMPRESSION = PAGE)
     );
         END;
@@ -1054,38 +1054,6 @@ BEGIN
                     (DATA_COMPRESSION = PAGE)
             );
 
-        END;
-        ELSE IF @table_name = N'session_wait_stats'
-        BEGIN
-            CREATE TABLE
-                collect.session_wait_stats
-            (
-                collection_id bigint IDENTITY NOT NULL,
-                collection_time datetime2(7) NOT NULL
-                    DEFAULT SYSDATETIME(),
-                session_id integer NOT NULL,
-                wait_type nvarchar(60) NOT NULL,
-                waiting_tasks_count bigint NOT NULL,
-                wait_time_ms bigint NOT NULL,
-                max_wait_time_ms bigint NOT NULL,
-                signal_wait_time_ms bigint NOT NULL,
-                /*Session context for correlation*/
-                database_id integer NULL,
-                database_name sysname NULL,
-                login_name nvarchar(128) NULL,
-                host_name nvarchar(128) NULL,
-                program_name nvarchar(128) NULL,
-                /*Query context if executing*/
-                sql_handle varbinary(64) NULL,
-                query_text nvarchar(max) NULL,
-                CONSTRAINT
-                    PK_session_wait_stats
-                PRIMARY KEY CLUSTERED
-                    (collection_time, collection_id)
-                WITH
-                    (DATA_COMPRESSION = PAGE)
-            );
-
         END;
         ELSE IF @table_name = N'running_jobs'
         BEGIN
@@ -1117,7 +1085,7 @@ BEGIN
         END;
         ELSE
         BEGIN
-            SET @error_message = N'Unknown table name: ' + @table_name + N'. Valid table names are: wait_stats, query_stats, memory_stats, memory_pressure_events, deadlock_xml, blocked_process_xml, procedure_stats, query_snapshots, query_store_data, trace_analysis, default_trace_events, file_io_stats, memory_grant_stats, cpu_scheduler_stats, memory_clerks_stats, perfmon_stats, cpu_utilization_stats, blocking_deadlock_stats, latch_stats, spinlock_stats, tempdb_stats, plan_cache_stats, session_stats, waiting_tasks, session_wait_stats, running_jobs';
+            SET @error_message = N'Unknown table name: ' + @table_name + N'. Valid table names are: wait_stats, query_stats, memory_stats, memory_pressure_events, deadlock_xml, blocked_process_xml, procedure_stats, query_snapshots, query_store_data, trace_analysis, default_trace_events, file_io_stats, memory_grant_stats, cpu_scheduler_stats, memory_clerks_stats, perfmon_stats, cpu_utilization_stats, blocking_deadlock_stats, latch_stats, spinlock_stats, tempdb_stats, plan_cache_stats, session_stats, waiting_tasks, running_jobs';
             RAISERROR(@error_message, 16, 1);
             RETURN;
         END;
diff --git a/install/09_collect_query_store.sql b/install/09_collect_query_store.sql
index 52608bf7..f8a13b20 100644
--- a/install/09_collect_query_store.sql
+++ b/install/09_collect_query_store.sql
@@ -265,17 +265,23 @@ BEGIN
         );
 
         /*
-        Loop through databases where Query Store is enabled
+        Build list of databases where Query Store is actually enabled.
+        Uses sys.database_query_store_options.actual_state instead of
+        sys.databases.is_query_store_on, which can be out of sync on Azure SQL DB.
         */
         DECLARE
-            @database_name sysname;
-
-        DECLARE @database_cursor CURSOR 
-        
-            SET @database_cursor = 
-                CURSOR 
-                LOCAL 
-                FAST_FORWARD 
+            @database_name sysname,
+            @qs_check_sql NVARCHAR(500);
+
+        DECLARE
+            @qs_databases TABLE (name sysname);
+
+        DECLARE @db_check_cursor CURSOR
+
+            SET @db_check_cursor =
+                CURSOR
+                LOCAL
+                FAST_FORWARD
             FOR
             SELECT
                 d.name
@@ -283,15 +289,64 @@ BEGIN
             WHERE d.state_desc = N'ONLINE'
             AND   d.database_id > 4
             AND   d.is_read_only = 0
-            AND   d.is_query_store_on = 1
             AND   d.name <> N'PerformanceMonitor'
             AND   d.database_id < 32761 /*exclude contained AG system databases*/
             OPTION(RECOMPILE);
 
+        OPEN @db_check_cursor;
+
+        FETCH NEXT
+        FROM @db_check_cursor
+        INTO @database_name;
+
+        WHILE @@FETCH_STATUS = 0
+        BEGIN
+            BEGIN TRY
+                SET @qs_check_sql =
+                    N'USE ' + QUOTENAME(@database_name) + N';
+                    SELECT ' + QUOTENAME(@database_name, '''') + N'
+                    WHERE EXISTS
+                    (
+                        SELECT
+                            1
+                        FROM sys.database_query_store_options
+                        WHERE actual_state > 0
+                    );';
+
+                INSERT @qs_databases (name)
+                EXEC(@qs_check_sql);
+            END TRY
+            BEGIN CATCH
+            END CATCH;
+
+            FETCH NEXT
+            FROM @db_check_cursor
+            INTO @database_name;
+        END;
+
+        CLOSE @db_check_cursor;
+        DEALLOCATE @db_check_cursor;
+
+        /*
+        Loop through databases where Query Store is enabled
+        */
+        DECLARE @database_cursor CURSOR
+
+            SET @database_cursor =
+                CURSOR
+                LOCAL
+                FAST_FORWARD
+            FOR
+            SELECT
+                q.name
+            FROM @qs_databases AS q
+            ORDER BY
+                q.name;
+
         OPEN @database_cursor;
 
-        FETCH NEXT 
-        FROM @database_cursor 
+        FETCH NEXT
+        FROM @database_cursor
         INTO @database_name;
 
         WHILE @@FETCH_STATUS = 0
diff --git a/install/15_collect_memory_grant_stats.sql b/install/15_collect_memory_grant_stats.sql
index 76b4de45..53b64aab 100644
--- a/install/15_collect_memory_grant_stats.sql
+++ b/install/15_collect_memory_grant_stats.sql
@@ -21,8 +21,8 @@ GO
 /*
 Memory grant statistics collector
 Collects memory grant semaphore data from sys.dm_exec_query_resource_semaphores
-Stores MB values and calculates pressure warnings
 Point-in-time snapshot data for memory grant pressure monitoring
+Delta calculation for cumulative counters handled by collect.calculate_deltas
 */
 
 IF OBJECT_ID(N'collect.memory_grant_stats_collector', N'P') IS NULL
@@ -98,12 +98,12 @@ BEGIN
 
         /*
         Collect memory grant semaphore statistics
-        Stores MB values and calculates pressure warnings
-        This is point-in-time state data showing current memory grant pressure
+        Point-in-time state data showing current memory grant pressure
         */
         INSERT INTO
             collect.memory_grant_stats
         (
+            server_start_time,
             resource_semaphore_id,
             pool_id,
             target_memory_mb,
@@ -115,13 +115,15 @@ BEGIN
             grantee_count,
             waiter_count,
             timeout_error_count,
-            forced_grant_count,
-            available_memory_pressure_warning,
-            waiter_count_warning,
-            timeout_error_warning,
-            forced_grant_warning
+            forced_grant_count
         )
         SELECT
+            server_start_time =
+            (
+                SELECT
+                    dosi.sqlserver_start_time
+                FROM sys.dm_os_sys_info AS dosi
+            ),
             resource_semaphore_id = deqrs.resource_semaphore_id,
             pool_id = deqrs.pool_id,
             target_memory_mb = deqrs.target_memory_kb / 1024.0,
@@ -133,129 +135,19 @@ BEGIN
             grantee_count = deqrs.grantee_count,
             waiter_count = deqrs.waiter_count,
             timeout_error_count = ISNULL(deqrs.timeout_error_count, 0),
-            forced_grant_count = ISNULL(deqrs.forced_grant_count, 0),
-            available_memory_pressure_warning =
-                CASE
-                    WHEN prev.available_memory_mb IS NOT NULL
-                    AND  (deqrs.available_memory_kb / 1024.0) < (prev.available_memory_mb * 0.80)
-                    THEN 1
-                    ELSE 0
-                END,
-            waiter_count_warning =
-                CASE
-                    WHEN deqrs.waiter_count > 0
-                    THEN 1
-                    ELSE 0
-                END,
-            timeout_error_warning =
-                CASE
-                    WHEN ISNULL(deqrs.timeout_error_count, 0) > 0
-                    THEN 1
-                    ELSE 0
-                END,
-            forced_grant_warning =
-                CASE
-                    WHEN ISNULL(deqrs.forced_grant_count, 0) > 0
-                    THEN 1
-                    ELSE 0
-                END
+            forced_grant_count = ISNULL(deqrs.forced_grant_count, 0)
         FROM sys.dm_exec_query_resource_semaphores AS deqrs
-        OUTER APPLY
-        (
-            SELECT TOP (1)
-                prev.available_memory_mb
-            FROM collect.memory_grant_stats AS prev
-            WHERE prev.resource_semaphore_id = deqrs.resource_semaphore_id
-            AND   prev.pool_id = deqrs.pool_id
-            ORDER BY
-                prev.collection_id DESC
-        ) AS prev
         WHERE deqrs.max_target_memory_kb IS NOT NULL
         OPTION(RECOMPILE);
 
         SET @rows_collected = ROWCOUNT_BIG();
 
         /*
-        Debug output for pressure warnings
+        Calculate deltas for cumulative counters
         */
-        IF @debug = 1
-        BEGIN
-            DECLARE
-                @current_available_memory_mb decimal(19,2),
-                @previous_available_memory_mb decimal(19,2),
-                @current_waiter_count integer,
-                @current_timeout_error_count bigint,
-                @current_forced_grant_count bigint,
-                @available_warning bit,
-                @waiter_warning bit,
-                @timeout_warning bit,
-                @forced_warning bit;
-
-            SELECT
-                @current_available_memory_mb = mgs.available_memory_mb,
-                @current_waiter_count = mgs.waiter_count,
-                @current_timeout_error_count = mgs.timeout_error_count,
-                @current_forced_grant_count = mgs.forced_grant_count,
-                @available_warning = mgs.available_memory_pressure_warning,
-                @waiter_warning = mgs.waiter_count_warning,
-                @timeout_warning = mgs.timeout_error_warning,
-                @forced_warning = mgs.forced_grant_warning
-            FROM collect.memory_grant_stats AS mgs
-            WHERE mgs.collection_id =
-            (
-                SELECT
-                    MAX(mgs2.collection_id)
-                FROM collect.memory_grant_stats AS mgs2
-            );
-
-            /*
-            Get previous available memory for warning message
-            */
-            SELECT TOP (1)
-                @previous_available_memory_mb = mgs.available_memory_mb
-            FROM collect.memory_grant_stats AS mgs
-            WHERE mgs.collection_id <
-            (
-                SELECT
-                    MAX(mgs2.collection_id)
-                FROM collect.memory_grant_stats AS mgs2
-            )
-            ORDER BY
-                mgs.collection_id DESC;
-
-            IF @available_warning = 1
-            BEGIN
-                DECLARE @available_msg nvarchar(500) =
-                    N'WARNING: Available memory grant dropped from ' +
-                    CONVERT(nvarchar(20), @previous_available_memory_mb) + N' MB to ' +
-                    CONVERT(nvarchar(20), @current_available_memory_mb) + N' MB (>20% drop)';
-                RAISERROR(@available_msg, 0, 1) WITH NOWAIT;
-            END;
-
-            IF @waiter_warning = 1
-            BEGIN
-                DECLARE @waiter_msg nvarchar(500) =
-                    N'WARNING: Memory grant waiters detected: ' +
-                    CONVERT(nvarchar(20), @current_waiter_count);
-                RAISERROR(@waiter_msg, 0, 1) WITH NOWAIT;
-            END;
-
-            IF @timeout_warning = 1
-            BEGIN
-                DECLARE @timeout_msg nvarchar(500) =
-                    N'WARNING: Memory grant timeout errors detected: ' +
-                    CONVERT(nvarchar(20), @current_timeout_error_count);
-                RAISERROR(@timeout_msg, 0, 1) WITH NOWAIT;
-            END;
-
-            IF @forced_warning = 1
-            BEGIN
-                DECLARE @forced_msg nvarchar(500) =
-                    N'WARNING: Forced memory grants detected: ' +
-                    CONVERT(nvarchar(20), @current_forced_grant_count);
-                RAISERROR(@forced_msg, 0, 1) WITH NOWAIT;
-            END;
-        END;
+        EXECUTE collect.calculate_deltas
+            @table_name = N'memory_grant_stats',
+            @debug = @debug;
 
         /*
         Log successful collection
@@ -318,5 +210,5 @@ GO
 
 PRINT 'Memory grant stats collector created successfully';
 PRINT 'Collects point-in-time memory grant semaphore data from sys.dm_exec_query_resource_semaphores';
-PRINT 'Stores MB values and calculates pressure warnings for memory grant monitoring';
+PRINT 'Delta calculation for timeout_error_count and forced_grant_count via collect.calculate_deltas';
 GO
diff --git a/install/19_collect_perfmon_stats.sql b/install/19_collect_perfmon_stats.sql
index 062686e3..6d8bf5de 100644
--- a/install/19_collect_perfmon_stats.sql
+++ b/install/19_collect_perfmon_stats.sql
@@ -157,6 +157,9 @@ BEGIN
         (
             /*I/O counters*/
             N'Forwarded Records/sec',
+            N'Full Scans/sec',
+            N'Index Searches/sec',
+            N'Page Splits/sec',
             N'Page reads/sec',
             N'Page writes/sec',
             N'Checkpoint pages/sec',
@@ -177,6 +180,8 @@ BEGIN
             N'Lock Waits/sec',
             N'Number of Deadlocks/sec',
             N'Lock waits',
+            N'Lock Timeouts/sec',
+            N'Processes blocked',
             /*Memory counters*/
             N'Granted Workspace Memory (KB)',
             N'Lock Memory (KB)',
@@ -187,6 +192,7 @@ BEGIN
             N'Total Server Memory (KB)',
             N'Memory grant queue waits',
             N'Thread-safe memory objects waits',
+            N'Free list stalls/sec',
             /*Compilation counters*/
             N'SQL Compilations/sec',
             N'SQL Re-Compilations/sec',
@@ -205,6 +211,15 @@ BEGIN
             N'Log Flush Write Time (ms)',
             N'Log buffer waits',
             N'Log write waits',
+            /*TempDB counters*/
+            N'Version Store Size (KB)',
+            N'Free Space in tempdb (KB)',
+            N'Active Temp Tables',
+            N'Version Generation rate (KB/s)',
+            N'Version Cleanup rate (KB/s)',
+            N'Temp Tables Creation Rate',
+            N'Workfiles Created/sec',
+            N'Worktables Created/sec',
             /*Wait counters*/
             N'Network IO waits',
             N'Wait for the worker'
diff --git a/install/37_collect_waiting_tasks.sql b/install/37_collect_waiting_tasks.sql
index 973f0b33..7d17a9dd 100644
--- a/install/37_collect_waiting_tasks.sql
+++ b/install/37_collect_waiting_tasks.sql
@@ -144,53 +144,21 @@ BEGIN
             wait_type = wt.wait_type,
             wait_duration_ms = wt.wait_duration_ms,
             blocking_session_id = ISNULL(wt.blocking_session_id, 0),
-            resource_description =
-                CASE
-                    WHEN LEN(wt.resource_description) > 1000
-                    THEN SUBSTRING(wt.resource_description, 1, 1000) + N'...'
-                    ELSE wt.resource_description
-                END,
-            database_id = der.database_id,
+            resource_description = NULL,
+            database_id = NULL,
             database_name = DB_NAME(der.database_id),
-            query_text =
-                CASE
-                    WHEN dest.text IS NULL
-                    THEN N'(unavailable)'
-                    WHEN LEN(dest.text) > 4000
-                    THEN SUBSTRING(dest.text, 1, 4000) + N'...'
-                    ELSE dest.text
-                END,
-            statement_text =
-                CASE
-                    WHEN dest.text IS NULL
-                    THEN N'(unavailable)'
-                    WHEN der.statement_start_offset = 0
-                    AND  der.statement_end_offset = 0
-                    THEN dest.text
-                    WHEN der.statement_end_offset = -1
-                    THEN SUBSTRING
-                         (
-                             dest.text,
-                             (der.statement_start_offset / 2) + 1,
-                             2147483647
-                         )
-                    ELSE SUBSTRING
-                         (
-                             dest.text,
-                             (der.statement_start_offset / 2) + 1,
-                             ((der.statement_end_offset - der.statement_start_offset) / 2) + 1
-                         )
-                END,
-            query_plan = qp.query_plan,
-            sql_handle = der.sql_handle,
-            plan_handle = der.plan_handle,
-            request_status = der.status,
-            command = der.command,
-            cpu_time_ms = der.cpu_time,
-            total_elapsed_time_ms = der.total_elapsed_time,
-            logical_reads = der.logical_reads,
-            writes = der.writes,
-            row_count = der.row_count
+            query_text = NULL,
+            statement_text = NULL,
+            query_plan = NULL,
+            sql_handle = NULL,
+            plan_handle = NULL,
+            request_status = NULL,
+            command = NULL,
+            cpu_time_ms = NULL,
+            total_elapsed_time_ms = NULL,
+            logical_reads = NULL,
+            writes = NULL,
+            row_count = NULL
         FROM sys.dm_os_waiting_tasks AS wt
         LEFT JOIN sys.dm_exec_requests AS der
           ON der.session_id = wt.session_id
diff --git a/install/40_collect_session_wait_stats.sql b/install/40_collect_session_wait_stats.sql
deleted file mode 100644
index de667e7f..00000000
--- a/install/40_collect_session_wait_stats.sql
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-Copyright 2026 Darling Data, LLC
-https://www.erikdarling.com/
-
-*/
-
-SET ANSI_NULLS ON;
-SET ANSI_PADDING ON;
-SET ANSI_WARNINGS ON;
-SET ARITHABORT ON;
-SET CONCAT_NULL_YIELDS_NULL ON;
-SET QUOTED_IDENTIFIER ON;
-SET NUMERIC_ROUNDABORT OFF;
-SET IMPLICIT_TRANSACTIONS OFF;
-SET STATISTICS TIME, IO OFF;
-GO
-
-USE PerformanceMonitor;
-GO
-
-/*
-Session Wait Stats Collector
-Collects per-session wait statistics from sys.dm_exec_session_wait_stats
-Allows correlation of waits to specific sessions/queries
-Requires SQL Server 2016 SP1 or later
-*/
-
-IF OBJECT_ID(N'collect.session_wait_stats_collector', N'P') IS NULL
-BEGIN
-    EXECUTE(N'CREATE PROCEDURE collect.session_wait_stats_collector AS RETURN 138;');
-END;
-GO
-
-ALTER PROCEDURE
-    collect.session_wait_stats_collector
-(
-    @min_wait_time_ms integer = 100, /*Minimum wait time to capture (reduces noise)*/
-    @debug bit = 0 /*Print debugging information*/
-)
-WITH RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON;
-    SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-
-    DECLARE
-        @rows_collected bigint = 0,
-        @start_time datetime2(7) = SYSDATETIME(),
-        @error_message nvarchar(4000),
-        @sql_version integer;
-
-    /*
-    Check SQL Server version - dm_exec_session_wait_stats requires 2016 SP1+
-    */
-    SELECT
-        @sql_version = CONVERT(integer, SERVERPROPERTY(N'ProductMajorVersion'));
-
-    IF @sql_version < 13
-    BEGIN
-        IF @debug = 1
-        BEGIN
-            RAISERROR(N'session_wait_stats_collector requires SQL Server 2016 or later (current: %d)', 0, 1, @sql_version) WITH NOWAIT;
-        END;
-
-        INSERT INTO
-            config.collection_log
-        (
-            collector_name,
-            collection_status,
-            rows_collected,
-            duration_ms,
-            error_message
-        )
-        VALUES
-        (
-            N'session_wait_stats_collector',
-            N'SKIPPED',
-            0,
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
-            N'Requires SQL Server 2016 SP1 or later'
-        );
-
-        RETURN;
-    END;
-
-    BEGIN TRY
-        /*
-        Ensure target table exists
-        */
-        IF OBJECT_ID(N'collect.session_wait_stats', N'U') IS NULL
-        BEGIN
-            INSERT INTO
-                config.collection_log
-            (
-                collection_time,
-                collector_name,
-                collection_status,
-                rows_collected,
-                duration_ms,
-                error_message
-            )
-            VALUES
-            (
-                @start_time,
-                N'session_wait_stats_collector',
-                N'TABLE_MISSING',
-                0,
-                0,
-                N'Table collect.session_wait_stats does not exist'
-            );
-
-            RAISERROR(N'Table collect.session_wait_stats does not exist. Please run 02_create_tables.sql', 16, 1);
-            RETURN;
-        END;
-
-        /*
-        Ensure config.ignored_wait_types exists
-        */
-        IF OBJECT_ID(N'config.ignored_wait_types', N'U') IS NULL
-        OR NOT EXISTS (SELECT 1/0 FROM config.ignored_wait_types WHERE is_enabled = 1)
-        BEGIN
-            IF @debug = 1
-            BEGIN
-                RAISERROR(N'config.ignored_wait_types table missing or empty - calling ensure_config_tables', 0, 1) WITH NOWAIT;
-            END;
-
-            EXECUTE config.ensure_config_tables
-                @debug = @debug;
-        END;
-
-        /*
-        Collect session wait statistics
-        Joins with sys.dm_exec_sessions for context
-        Joins with sys.dm_exec_requests for current query info
-        Filters out ignored wait types and low wait times
-        */
-        INSERT INTO
-            collect.session_wait_stats
-        (
-            session_id,
-            wait_type,
-            waiting_tasks_count,
-            wait_time_ms,
-            max_wait_time_ms,
-            signal_wait_time_ms,
-            database_id,
-            database_name,
-            login_name,
-            host_name,
-            program_name,
-            sql_handle,
-            query_text
-        )
-        SELECT
-            session_id = sws.session_id,
-            wait_type = sws.wait_type,
-            waiting_tasks_count = sws.waiting_tasks_count,
-            wait_time_ms = sws.wait_time_ms,
-            max_wait_time_ms = sws.max_wait_time_ms,
-            signal_wait_time_ms = sws.signal_wait_time_ms,
-            database_id = s.database_id,
-            database_name = DB_NAME(s.database_id),
-            login_name = s.login_name,
-            host_name = s.host_name,
-            program_name = s.program_name,
-            sql_handle = r.sql_handle,
-            query_text = st.text
-        FROM sys.dm_exec_session_wait_stats AS sws
-        JOIN sys.dm_exec_sessions AS s
-          ON s.session_id = sws.session_id
-        LEFT JOIN sys.dm_exec_requests AS r
-          ON r.session_id = sws.session_id
-        OUTER APPLY sys.dm_exec_sql_text(r.sql_handle) AS st
-        WHERE sws.wait_time_ms >= @min_wait_time_ms
-        AND   s.is_user_process = 1
-        AND   NOT EXISTS
-        (
-            SELECT
-                1/0
-            FROM config.ignored_wait_types AS iwt
-            WHERE iwt.wait_type = sws.wait_type
-            AND   iwt.is_enabled = 1
-        )
-        OPTION(RECOMPILE);
-
-        SET @rows_collected = ROWCOUNT_BIG();
-
-        /*
-        Log successful collection
-        */
-        INSERT INTO
-            config.collection_log
-        (
-            collector_name,
-            collection_status,
-            rows_collected,
-            duration_ms
-        )
-        VALUES
-        (
-            N'session_wait_stats_collector',
-            N'SUCCESS',
-            @rows_collected,
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME())
-        );
-
-        IF @debug = 1
-        BEGIN
-            RAISERROR(N'Collected %d session wait stats rows', 0, 1, @rows_collected) WITH NOWAIT;
-        END;
-
-    END TRY
-    BEGIN CATCH
-        SET @error_message = ERROR_MESSAGE();
-
-        /*
-        Log the error
-        */
-        INSERT INTO
-            config.collection_log
-        (
-            collector_name,
-            collection_status,
-            duration_ms,
-            error_message
-        )
-        VALUES
-        (
-            N'session_wait_stats_collector',
-            N'ERROR',
-            DATEDIFF(MILLISECOND, @start_time, SYSDATETIME()),
-            @error_message
-        );
-
-        RAISERROR(N'Error in session_wait_stats_collector: %s', 16, 1, @error_message);
-    END CATCH;
-END;
-GO
-
-PRINT 'Session wait stats collector created successfully';
-PRINT 'Use collect.session_wait_stats_collector to collect per-session wait statistics';
-PRINT 'Requires SQL Server 2016 SP1 or later';
-GO
diff --git a/install/41_schedule_management.sql b/install/41_schedule_management.sql
index e46333ff..80799b43 100644
--- a/install/41_schedule_management.sql
+++ b/install/41_schedule_management.sql
@@ -160,7 +160,6 @@ BEGIN
     BEGIN TRY
         /*High frequency for real-time dashboard*/
         EXECUTE config.update_collector_frequency N'query_snapshots_collector', 1, 1;
-        EXECUTE config.update_collector_frequency N'session_wait_stats_collector', 1, 1;
         EXECUTE config.update_collector_frequency N'wait_stats_collector', 1, 1;
         EXECUTE config.update_collector_frequency N'query_stats_collector', 1, 1;
         EXECUTE config.update_collector_frequency N'procedure_stats_collector', 2, 1;
@@ -218,7 +217,6 @@ BEGIN
     BEGIN TRY
         /*Balanced frequencies for consulting work*/
         EXECUTE config.update_collector_frequency N'query_snapshots_collector', 1, 1;
-        EXECUTE config.update_collector_frequency N'session_wait_stats_collector', 1, 1;
         EXECUTE config.update_collector_frequency N'wait_stats_collector', 5, 1;
         EXECUTE config.update_collector_frequency N'query_stats_collector', 5, 1;
         EXECUTE config.update_collector_frequency N'procedure_stats_collector', 5, 1;
@@ -285,7 +283,6 @@ BEGIN
 
         /*Disable high-frequency collectors*/
         EXECUTE config.set_collector_enabled N'query_snapshots_collector', 0;
-        EXECUTE config.set_collector_enabled N'session_wait_stats_collector', 0;
 
         PRINT 'Baseline monitoring profile enabled';
         PRINT 'All collectors at 5-minute intervals, snapshots disabled';
diff --git a/install/42_scheduled_master_collector.sql b/install/42_scheduled_master_collector.sql
index 791a4953..a192a90e 100644
--- a/install/42_scheduled_master_collector.sql
+++ b/install/42_scheduled_master_collector.sql
@@ -311,10 +311,6 @@ BEGIN
                 BEGIN
                     EXECUTE collect.waiting_tasks_collector @debug = @debug;
                 END;
-                ELSE IF @collector_name = N'session_wait_stats_collector'
-                BEGIN
-                    EXECUTE collect.session_wait_stats_collector @debug = @debug;
-                END;
                 ELSE IF @collector_name = N'running_jobs_collector'
                 BEGIN
                     EXECUTE collect.running_jobs_collector @debug = @debug;
diff --git a/install/43_data_retention.sql b/install/43_data_retention.sql
index dc310837..dc47775c 100644
--- a/install/43_data_retention.sql
+++ b/install/43_data_retention.sql
@@ -20,8 +20,10 @@ GO
 
 /*
 Data retention procedure for performance monitoring system
-Automatically purges old data from ALL collection tables based on configurable retention periods
-DYNAMIC VERSION - automatically discovers tables in collect schema with collection_time column
+Automatically purges old data from ALL collection tables
+Uses per-collector retention from config.collection_schedule when available,
+falls back to @retention_days parameter for unmatched tables
+DYNAMIC VERSION - automatically discovers tables in collect schema with time columns
 */
 
 IF OBJECT_ID(N'config.data_retention', N'P') IS NULL
@@ -33,7 +35,7 @@ GO
 ALTER PROCEDURE
     config.data_retention
 (
-    @retention_days integer = 30, /*Number of days to retain collected data*/
+    @retention_days integer = 30, /*Fallback retention for tables without a collection_schedule entry*/
     @batch_size integer = 10000, /*Number of rows to delete per batch to avoid blocking*/
     @debug bit = 0 /*Print debugging information*/
 )
@@ -194,6 +196,42 @@ BEGIN
             WHERE ttc.table_name = t.name
         );
 
+        /*
+        Override retention_date per-collector from config.collection_schedule.
+        Direct match: strip _collector/_analyzer suffix and match table name prefix.
+        */
+        UPDATE ttc
+        SET ttc.retention_date = DATEADD(DAY, -cs.retention_days, SYSDATETIME())
+        FROM #tables_to_clean AS ttc
+        JOIN config.collection_schedule AS cs
+          ON ttc.table_name LIKE REPLACE(REPLACE(cs.collector_name, N'_collector', N''), N'_analyzer', N'') + N'%';
+
+        /*
+        Special mappings for tables whose names don't match their collector:
+        - HealthParser_* tables -> system_health_collector
+        - blocking_BlockedProcessReport -> process_blocked_process_xml
+        - deadlocks (sp_BlitzLock output) -> process_deadlock_xml
+        */
+        UPDATE ttc
+        SET ttc.retention_date = DATEADD(DAY, -cs.retention_days, SYSDATETIME())
+        FROM #tables_to_clean AS ttc
+        CROSS JOIN config.collection_schedule AS cs
+        WHERE
+        (
+            ttc.table_name LIKE N'HealthParser%'
+            AND cs.collector_name = N'system_health_collector'
+        )
+        OR
+        (
+            ttc.table_name = N'blocking_BlockedProcessReport'
+            AND cs.collector_name = N'process_blocked_process_xml'
+        )
+        OR
+        (
+            ttc.table_name = N'deadlocks'
+            AND cs.collector_name = N'process_deadlock_xml'
+        );
+
         /*
         Special handling for config.collection_log - keep 2x longer
         */
@@ -399,12 +437,13 @@ GO
 
 PRINT 'Data retention procedure created successfully (DYNAMIC VERSION)';
 PRINT 'Use config.data_retention to automatically purge old monitoring data';
-PRINT 'AUTOMATICALLY discovers ALL collect schema tables with time columns';
+PRINT 'Uses per-collector retention from config.collection_schedule when available';
+PRINT 'Falls back to @retention_days parameter for unmatched tables';
 PRINT '';
 PRINT 'Examples:';
-PRINT '  -- Keep 30 days (default)';
+PRINT '  -- Use per-collector retention (default)';
 PRINT '  EXECUTE config.data_retention @debug = 1;';
 PRINT '';
-PRINT '  -- Keep 90 days';
+PRINT '  -- Override fallback to 90 days for tables without schedule entries';
 PRINT '  EXECUTE config.data_retention @retention_days = 90;';
 GO
diff --git a/install/45_create_agent_jobs.sql b/install/45_create_agent_jobs.sql
index d9ba1085..e7ce07cf 100644
--- a/install/45_create_agent_jobs.sql
+++ b/install/45_create_agent_jobs.sql
@@ -164,7 +164,7 @@ EXECUTE msdb.dbo.sp_add_jobstep
     @step_name = N'Run Data Retention',
     @subsystem = N'TSQL',
     @database_name = N'PerformanceMonitor',
-    @command = N'EXECUTE config.data_retention @retention_days = 30, @debug = 1;',
+    @command = N'EXECUTE config.data_retention @debug = 1;',
     @retry_attempts = 0,
     @on_success_action = 1; /*Quit with success*/
 
diff --git a/install/47_create_reporting_views.sql b/install/47_create_reporting_views.sql
index 016e64ad..93ae386f 100644
--- a/install/47_create_reporting_views.sql
+++ b/install/47_create_reporting_views.sql
@@ -86,6 +86,44 @@ WITH
     WHERE cl.collection_time >= DATEADD(DAY, -7, SYSDATETIME())
     GROUP BY
         cl.collector_name
+),
+    /*
+    Count consecutive recent failures per collector.
+    If the last 5+ runs are all errors, the collector is
+    actively broken regardless of 7-day failure percentage.
+    */
+    recent_failures AS
+(
+    SELECT
+        collector_name = r.collector_name,
+        consecutive_failures =
+            MIN
+            (
+                CASE
+                    WHEN r.collection_status <> N'ERROR'
+                    THEN r.rn
+                    ELSE NULL
+                END
+            )
+    FROM
+    (
+        SELECT
+            cl.collector_name,
+            cl.collection_status,
+            rn = ROW_NUMBER() OVER
+            (
+                PARTITION BY
+                    cl.collector_name
+                ORDER BY
+                    cl.collection_time DESC
+            )
+        FROM config.collection_log AS cl
+        WHERE cl.collection_status NOT IN (N'CONFIG_CHANGE', N'TABLE_MISSING', N'TABLE_CREATED', N'SKIPPED')
+        AND   cl.collection_time >= DATEADD(DAY, -7, SYSDATETIME())
+    ) AS r
+    WHERE r.rn <= 20
+    GROUP BY
+        r.collector_name
 )
 SELECT
     collector_name = cs.collector_name,
@@ -99,6 +137,12 @@ SELECT
             THEN N'NEVER_RUN'
             WHEN DATEDIFF(HOUR, cs.last_success_time, SYSDATETIME()) > 24
             THEN N'STALE'
+            WHEN rf.consecutive_failures IS NULL
+            THEN N'FAILING'
+            WHEN rf.consecutive_failures > 5
+            THEN N'FAILING'
+            WHEN rf.consecutive_failures > 3
+            THEN N'WARNING'
             WHEN cs.failed_runs * 100.0 / NULLIF(cs.total_runs, 0) > 50
             THEN N'FAILING'
             WHEN cs.failed_runs * 100.0 / NULLIF(cs.total_runs, 0) > 10
@@ -115,7 +159,9 @@ SELECT
     failed_runs_7d = cs.failed_runs,
     avg_duration_ms = CONVERT(integer, cs.avg_duration_ms),
     total_rows_collected_7d = cs.total_rows_collected
-FROM collector_stats AS cs;
+FROM collector_stats AS cs
+LEFT JOIN recent_failures AS rf
+    ON cs.collector_name = rf.collector_name;
 GO
 
 /*
@@ -2676,118 +2722,6 @@ PRINT '  - report.query_store_regressions (performance regressions)';
 PRINT '  - report.long_running_query_patterns (trace analysis)';
 GO
 
-/*
-=============================================================================
-SESSION WAIT ANALYSIS
-Shows per-session wait patterns with query context from session_wait_stats
-Requires SQL Server 2016 SP1+ (collector skips gracefully on older versions)
-=============================================================================
-*/
-CREATE OR ALTER VIEW
-    report.session_wait_analysis
-AS
-WITH
-    recent_session_waits AS
-(
-    SELECT
-        sws.session_id,
-        sws.database_name,
-        sws.login_name,
-        sws.host_name,
-        sws.program_name,
-        sws.wait_type,
-        sws.wait_time_ms,
-        sws.waiting_tasks_count,
-        sws.max_wait_time_ms,
-        sws.signal_wait_time_ms,
-        sws.query_text,
-        sws.collection_time,
-        /*Rank by total wait time per session*/
-        session_wait_rank = ROW_NUMBER() OVER
-            (
-                PARTITION BY
-                    sws.session_id
-                ORDER BY
-                    sws.wait_time_ms DESC
-            )
-    FROM collect.session_wait_stats AS sws
-    WHERE sws.collection_time >= DATEADD(HOUR, -1, SYSDATETIME())
-),
-    session_totals AS
-(
-    SELECT
-        session_id,
-        total_wait_time_ms = SUM(wait_time_ms),
-        total_waiting_tasks = SUM(waiting_tasks_count),
-        distinct_wait_types = COUNT_BIG(DISTINCT wait_type)
-    FROM recent_session_waits
-    GROUP BY
-        session_id
-)
-SELECT TOP (100)
-    rsw.session_id,
-    rsw.database_name,
-    rsw.login_name,
-    rsw.host_name,
-    rsw.program_name,
-    /*Top wait for this session*/
-    top_wait_type = rsw.wait_type,
-    top_wait_time_ms = rsw.wait_time_ms,
-    top_wait_tasks = rsw.waiting_tasks_count,
-    top_wait_max_ms = rsw.max_wait_time_ms,
-    top_wait_signal_ms = rsw.signal_wait_time_ms,
-    /*Session totals*/
-    st.total_wait_time_ms,
-    st.total_waiting_tasks,
-    st.distinct_wait_types,
-    /*Wait time breakdown*/
-    resource_wait_ms = rsw.wait_time_ms - rsw.signal_wait_time_ms,
-    signal_wait_percent =
-        CASE
-            WHEN rsw.wait_time_ms > 0
-            THEN CONVERT(decimal(5,2), rsw.signal_wait_time_ms * 100.0 / rsw.wait_time_ms)
-            ELSE 0
-        END,
-    /*Assessment*/
-    wait_concern =
-        CASE
-            WHEN rsw.wait_time_ms > 60000 THEN N'CRITICAL - > 1 minute wait'
-            WHEN rsw.wait_time_ms > 30000 THEN N'HIGH - > 30 second wait'
-            WHEN rsw.wait_time_ms > 10000 THEN N'MEDIUM - > 10 second wait'
-            WHEN rsw.signal_wait_time_ms * 100.0 / NULLIF(rsw.wait_time_ms, 0) > 25
-            THEN N'MEDIUM - High signal wait (CPU pressure)'
-            ELSE N'LOW'
-        END,
-    recommendation =
-        CASE
-            WHEN rsw.wait_type LIKE N'LCK_M_%'
-            THEN N'Lock wait - check for blocking, review transaction scope'
-            WHEN rsw.wait_type LIKE N'PAGEIOLATCH_%'
-            THEN N'I/O wait - check storage latency, consider adding memory'
-            WHEN rsw.wait_type LIKE N'PAGELATCH_%'
-            THEN N'Page latch - check for tempdb contention or hot pages'
-            WHEN rsw.wait_type = N'CXPACKET'
-            THEN N'Parallelism wait - review MAXDOP settings, check for skewed parallelism'
-            WHEN rsw.wait_type = N'SOS_SCHEDULER_YIELD'
-            THEN N'CPU pressure - query is CPU-bound'
-            WHEN rsw.wait_type LIKE N'ASYNC_NETWORK_IO%'
-            THEN N'Network wait - client not consuming results fast enough'
-            WHEN rsw.wait_type = N'RESOURCE_SEMAPHORE'
-            THEN N'Memory grant wait - query needs large memory grant'
-            WHEN rsw.wait_type = N'WRITELOG'
-            THEN N'Transaction log write - check log disk performance'
-            ELSE N'Review wait type documentation'
-        END,
-    query_text = CONVERT(nvarchar(500), rsw.query_text),
-    last_seen = rsw.collection_time
-FROM recent_session_waits AS rsw
-JOIN session_totals AS st
-  ON st.session_id = rsw.session_id
-WHERE rsw.session_wait_rank = 1
-ORDER BY
-    rsw.wait_time_ms DESC;
-GO
-
 /*
 =============================================================================
 CRITICAL ISSUES
@@ -2856,7 +2790,6 @@ PRINT '  - report.blocking_chain_analysis (blocking hierarchies with query plans
 PRINT '  - report.tempdb_contention_analysis (tempdb + PFS/GAM waits + sessions)';
 PRINT '  - report.parameter_sensitivity_detection (same query_hash, different plans)';
 PRINT '  - report.scheduler_cpu_analysis (scheduler health + runnable task trends)';
-PRINT '  - report.session_wait_analysis (per-session waits with query context)';
 PRINT '  - report.critical_issues (configuration problems with recommendations)';
 PRINT '';
 PRINT 'Quick health check:';
diff --git a/install/50_configuration_issues_analyzer.sql b/install/50_configuration_issues_analyzer.sql
index ae114a8a..5b9e6de6 100644
--- a/install/50_configuration_issues_analyzer.sql
+++ b/install/50_configuration_issues_analyzer.sql
@@ -385,7 +385,7 @@ BEGIN
             message,
             investigate_query
         )
-        /*Available memory pressure warning*/
+        /*Available memory pressure warning — low available memory for grants (<100MB)*/
         SELECT
             severity = N'WARNING',
             problem_area = N'Memory Grant Pressure',
@@ -397,7 +397,8 @@ BEGIN
                 N'. Available: ' + CONVERT(nvarchar(20), mgs.available_memory_mb) + N' MB.',
             investigate_query = N'SELECT * FROM collect.memory_grant_stats WHERE collection_time >= DATEADD(HOUR, -1, SYSDATETIME()) ORDER BY collection_time DESC;'
         FROM collect.memory_grant_stats AS mgs
-        WHERE mgs.available_memory_pressure_warning = 1
+        WHERE mgs.available_memory_mb < 100
+        AND   mgs.granted_memory_mb > 0
         AND   mgs.collection_time >= DATEADD(MINUTE, -5, SYSDATETIME())
         AND   NOT EXISTS
               (
@@ -412,7 +413,7 @@ BEGIN
 
         UNION ALL
 
-        /*Waiter count warning*/
+        /*Waiter count warning — high number of queries waiting for memory grants (>10)*/
         SELECT
             severity = N'WARNING',
             problem_area = N'Memory Grant Pressure',
@@ -424,7 +425,7 @@ BEGIN
                 N'. Waiters: ' + CONVERT(nvarchar(10), mgs.waiter_count) + N'.',
             investigate_query = N'SELECT * FROM collect.memory_grant_stats WHERE collection_time >= DATEADD(HOUR, -1, SYSDATETIME()) ORDER BY collection_time DESC;'
         FROM collect.memory_grant_stats AS mgs
-        WHERE mgs.waiter_count_warning = 1
+        WHERE mgs.waiter_count > 10
         AND   mgs.collection_time >= DATEADD(MINUTE, -5, SYSDATETIME())
         AND   NOT EXISTS
               (
@@ -439,7 +440,7 @@ BEGIN
 
         UNION ALL
 
-        /*Timeout error warning - CRITICAL severity*/
+        /*Timeout error warning — queries timing out waiting for memory (delta > 0), CRITICAL severity*/
         SELECT
             severity = N'CRITICAL',
             problem_area = N'Memory Grant Pressure',
@@ -448,10 +449,10 @@ BEGIN
             message =
                 N'CRITICAL: Queries timing out waiting for memory grants at ' +
                 CONVERT(nvarchar(30), mgs.collection_time, 121) +
-                N'. Timeout errors: ' + CONVERT(nvarchar(10), mgs.timeout_error_count) + N'.',
+                N'. Timeout errors: ' + CONVERT(nvarchar(10), ISNULL(mgs.timeout_error_count_delta, 0)) + N'.',
             investigate_query = N'SELECT * FROM collect.memory_grant_stats WHERE collection_time >= DATEADD(HOUR, -1, SYSDATETIME()) ORDER BY collection_time DESC;'
         FROM collect.memory_grant_stats AS mgs
-        WHERE mgs.timeout_error_warning = 1
+        WHERE ISNULL(mgs.timeout_error_count_delta, 0) > 0
         AND   mgs.collection_time >= DATEADD(MINUTE, -5, SYSDATETIME())
         AND   NOT EXISTS
               (
@@ -466,7 +467,7 @@ BEGIN
 
         UNION ALL
 
-        /*Forced grant warning*/
+        /*Forced grant warning — queries forced to run with insufficient memory (delta > 0)*/
         SELECT
             severity = N'WARNING',
             problem_area = N'Memory Grant Pressure',
@@ -475,11 +476,11 @@ BEGIN
             message =
                 N'Queries forced to run with insufficient memory at ' +
                 CONVERT(nvarchar(30), mgs.collection_time, 121) +
-                N'. Forced grants: ' + CONVERT(nvarchar(10), mgs.forced_grant_count) +
+                N'. Forced grants: ' + CONVERT(nvarchar(10), ISNULL(mgs.forced_grant_count_delta, 0)) +
                 N'. These queries will spill to tempdb.',
             investigate_query = N'SELECT * FROM collect.memory_grant_stats WHERE collection_time >= DATEADD(HOUR, -1, SYSDATETIME()) ORDER BY collection_time DESC;'
         FROM collect.memory_grant_stats AS mgs
-        WHERE mgs.forced_grant_warning = 1
+        WHERE ISNULL(mgs.forced_grant_count_delta, 0) > 0
         AND   mgs.collection_time >= DATEADD(MINUTE, -5, SYSDATETIME())
         AND   NOT EXISTS
               (
diff --git a/install/97_test_procedures.sql b/install/97_test_procedures.sql
index e7d25c9f..fac3b155 100644
--- a/install/97_test_procedures.sql
+++ b/install/97_test_procedures.sql
@@ -278,10 +278,10 @@ INSERT INTO
     waiter_count,
     timeout_error_count,
     forced_grant_count,
-    available_memory_pressure_warning,
-    waiter_count_warning,
-    timeout_error_warning,
-    forced_grant_warning
+    server_start_time,
+    timeout_error_count_delta,
+    forced_grant_count_delta,
+    sample_interval_seconds
 )
 VALUES
 (
@@ -298,10 +298,10 @@ VALUES
     25, /* High waiter count */
     10, /* Timeouts occurring */
     5,  /* Forced grants */
-    1,  /* Memory pressure warning */
-    1,  /* Waiter warning */
-    1,  /* Timeout warning */
-    1   /* Forced grant warning */
+    @test_collection_time, /* server_start_time */
+    10, /* timeout_error_count_delta */
+    5,  /* forced_grant_count_delta */
+    30  /* sample_interval_seconds */
 );
 
 PRINT '✓ Test 5 data created: Memory grant pressure > 20% threshold';
diff --git a/install/98_validate_installation.sql b/install/98_validate_installation.sql
index 11c82700..77fa7a20 100644
--- a/install/98_validate_installation.sql
+++ b/install/98_validate_installation.sql
@@ -294,30 +294,6 @@ BEGIN
     HAVING COUNT_BIG(*) > 0;
 END;
 
-/*
-Session wait stats - session_id and wait_type should never be NULL
-*/
-IF OBJECT_ID(N'collect.session_wait_stats', N'U') IS NOT NULL
-BEGIN
-    INSERT INTO @null_checks
-    SELECT
-        table_name = N'session_wait_stats',
-        column_name = N'session_id',
-        null_count = COUNT_BIG(*)
-    FROM collect.session_wait_stats
-    WHERE session_id IS NULL
-    HAVING COUNT_BIG(*) > 0;
-
-    INSERT INTO @null_checks
-    SELECT
-        table_name = N'session_wait_stats',
-        column_name = N'wait_type',
-        null_count = COUNT_BIG(*)
-    FROM collect.session_wait_stats
-    WHERE wait_type IS NULL
-    HAVING COUNT_BIG(*) > 0;
-END;
-
 IF EXISTS (SELECT 1/0 FROM @null_checks)
 BEGIN
     PRINT '*** NULL VALUES FOUND IN REQUIRED COLUMNS ***';
diff --git a/install/99_user_troubleshooting.sql b/install/99_user_troubleshooting.sql
index e89e952c..c00585cb 100644
--- a/install/99_user_troubleshooting.sql
+++ b/install/99_user_troubleshooting.sql
@@ -379,15 +379,6 @@ EXECUTE collect.waiting_tasks_collector
     @debug = 1;
 GO
 
-/*
-32. Session Wait Stats Collector
-Collects per-session wait statistics from sys.dm_exec_session_wait_stats
-Requires SQL Server 2016 SP1 or later - will skip gracefully on older versions
-*/
-EXECUTE collect.session_wait_stats_collector
-    @debug = 1;
-GO
-
 /*
 ===============================================================================
 UTILITY COMMANDS
@@ -572,13 +563,6 @@ SELECT
     row_count = COUNT_BIG(*)
 FROM collect.waiting_tasks
 
-UNION ALL
-
-SELECT
-    table_name = N'session_wait_stats',
-    row_count = COUNT_BIG(*)
-FROM collect.session_wait_stats
-
 ORDER BY
     table_name;
 GO
@@ -762,14 +746,6 @@ SELECT
     max_collection_id = MAX(wt.collection_id)
 FROM collect.waiting_tasks AS wt
 
-UNION ALL
-
-SELECT
-    table_name = N'session_wait_stats',
-    max_collection_time = MAX(sws.collection_time),
-    max_collection_id = MAX(sws.collection_id)
-FROM collect.session_wait_stats AS sws
-
 ORDER BY
     table_name;
 GO
diff --git a/upgrades/1.3.0-to-2.0.0/01_memory_grant_stats_schema.sql b/upgrades/1.3.0-to-2.0.0/01_memory_grant_stats_schema.sql
new file mode 100644
index 00000000..738663a5
--- /dev/null
+++ b/upgrades/1.3.0-to-2.0.0/01_memory_grant_stats_schema.sql
@@ -0,0 +1,172 @@
+/*
+Copyright 2026 Darling Data, LLC
+https://www.erikdarling.com/
+
+Upgrade from 1.3.0 to 2.0.0
+Adds server_start_time and delta columns to collect.memory_grant_stats
+for proper delta framework integration.
+Drops unused warning columns from the inline delta approach.
+*/
+
+SET ANSI_NULLS ON;
+SET ANSI_PADDING ON;
+SET ANSI_WARNINGS ON;
+SET ARITHABORT ON;
+SET CONCAT_NULL_YIELDS_NULL ON;
+SET QUOTED_IDENTIFIER ON;
+SET NUMERIC_ROUNDABORT OFF;
+SET IMPLICIT_TRANSACTIONS OFF;
+SET STATISTICS TIME, IO OFF;
+GO
+
+USE PerformanceMonitor;
+GO
+
+/* Add server_start_time for delta framework restart detection */
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'server_start_time'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    ADD
+        server_start_time datetime2(7) NULL;
+
+    PRINT 'Added server_start_time to collect.memory_grant_stats';
+END;
+GO
+
+/* Add timeout_error_count_delta for delta framework */
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'timeout_error_count_delta'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    ADD
+        timeout_error_count_delta bigint NULL;
+
+    PRINT 'Added timeout_error_count_delta to collect.memory_grant_stats';
+END;
+GO
+
+/* Add forced_grant_count_delta for delta framework */
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'forced_grant_count_delta'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    ADD
+        forced_grant_count_delta bigint NULL;
+
+    PRINT 'Added forced_grant_count_delta to collect.memory_grant_stats';
+END;
+GO
+
+/* Add sample_interval_seconds for delta framework */
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'sample_interval_seconds'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    ADD
+        sample_interval_seconds integer NULL;
+
+    PRINT 'Added sample_interval_seconds to collect.memory_grant_stats';
+END;
+GO
+
+/* Drop unused warning columns from the old inline delta approach */
+IF EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'available_memory_pressure_warning'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    DROP COLUMN
+        available_memory_pressure_warning;
+
+    PRINT 'Dropped available_memory_pressure_warning from collect.memory_grant_stats';
+END;
+GO
+
+IF EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'waiter_count_warning'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    DROP COLUMN
+        waiter_count_warning;
+
+    PRINT 'Dropped waiter_count_warning from collect.memory_grant_stats';
+END;
+GO
+
+IF EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'timeout_error_warning'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    DROP COLUMN
+        timeout_error_warning;
+
+    PRINT 'Dropped timeout_error_warning from collect.memory_grant_stats';
+END;
+GO
+
+IF EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_grant_stats')
+    AND   name = N'forced_grant_warning'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_grant_stats
+    DROP COLUMN
+        forced_grant_warning;
+
+    PRINT 'Dropped forced_grant_warning from collect.memory_grant_stats';
+END;
+GO
diff --git a/upgrades/1.3.0-to-2.0.0/02_session_wait_stats_cleanup.sql b/upgrades/1.3.0-to-2.0.0/02_session_wait_stats_cleanup.sql
new file mode 100644
index 00000000..9c8932d5
--- /dev/null
+++ b/upgrades/1.3.0-to-2.0.0/02_session_wait_stats_cleanup.sql
@@ -0,0 +1,63 @@
+/*
+Copyright 2026 Darling Data, LLC
+https://www.erikdarling.com/
+
+Upgrade from 1.3.0 to 2.0.0
+Removes session_wait_stats collector (zero UI, never surfaced in Dashboard or Lite).
+*/
+
+SET ANSI_NULLS ON;
+SET ANSI_PADDING ON;
+SET ANSI_WARNINGS ON;
+SET ARITHABORT ON;
+SET CONCAT_NULL_YIELDS_NULL ON;
+SET QUOTED_IDENTIFIER ON;
+SET NUMERIC_ROUNDABORT OFF;
+SET IMPLICIT_TRANSACTIONS OFF;
+SET STATISTICS TIME, IO OFF;
+GO
+
+USE PerformanceMonitor;
+GO
+
+/* Remove reporting view */
+IF OBJECT_ID(N'report.session_wait_analysis', N'V') IS NOT NULL
+BEGIN
+    DROP VIEW
+        report.session_wait_analysis;
+
+    PRINT 'Dropped report.session_wait_analysis';
+END;
+GO
+
+/* Remove collector procedure */
+IF OBJECT_ID(N'collect.session_wait_stats_collector', N'P') IS NOT NULL
+BEGIN
+    DROP PROCEDURE
+        collect.session_wait_stats_collector;
+
+    PRINT 'Dropped collect.session_wait_stats_collector';
+END;
+GO
+
+/* Remove collection table */
+IF OBJECT_ID(N'collect.session_wait_stats', N'U') IS NOT NULL
+BEGIN
+    DROP TABLE
+        collect.session_wait_stats;
+
+    PRINT 'Dropped collect.session_wait_stats';
+END;
+GO
+
+/* Remove schedule entry */
+IF OBJECT_ID(N'config.collection_schedule', N'U') IS NOT NULL
+BEGIN
+    DELETE FROM
+        config.collection_schedule
+    WHERE
+        collector_name = N'session_wait_stats_collector';
+
+    PRINT 'Removed session_wait_stats_collector from config.collection_schedule';
+END;
+GO
diff --git a/upgrades/1.3.0-to-2.0.0/upgrade.txt b/upgrades/1.3.0-to-2.0.0/upgrade.txt
new file mode 100644
index 00000000..4b7bdf58
--- /dev/null
+++ b/upgrades/1.3.0-to-2.0.0/upgrade.txt
@@ -0,0 +1,2 @@
+01_memory_grant_stats_schema.sql
+02_session_wait_stats_cleanup.sql
diff --git a/upgrades/README.md b/upgrades/README.md
index fcf28827..28395114 100644
--- a/upgrades/README.md
+++ b/upgrades/README.md
@@ -73,4 +73,6 @@ GO
 - **1.2.0**: Current Configuration tabs, Default Trace DynamicResource fix, alert badge, chart tooltips, drill-down sizing
 - **1.3.0**: Add total_physical_memory_mb and committed_target_memory_mb to memory_stats collector
 
+- **2.0.0**: Add server_start_time and delta columns to memory_grant_stats for delta framework; drop unused warning columns; new Memory Grants charts
+
 Future upgrade folders will be added here as new versions are released.