diff --git a/CHANGELOG.md b/CHANGELOG.md
index 715e3f9b..1f999e77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,83 @@ 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).
 
+## [1.3.0] - 2026-02-20
+
+### Important
+
+- **Schema upgrade**: The `collect.memory_stats` table gains two new columns (`total_physical_memory_mb`, `committed_target_memory_mb`). The upgrade script runs automatically via the CLI/GUI installer and uses `IF NOT EXISTS` checks, so it is safe to re-run. On servers with very large `memory_stats` tables this ALTER may take a moment.
+
+### Added
+
+- Physical Memory, SQL Server Memory, and Target Memory columns in Memory Overview ([#140])
+- Current Configuration view (Server Config, Database Config, Trace Flags) in Dashboard Overview ([#143])
+- Popup column filters and right-click context menus in all drill-down history windows ([#206])
+- Consistent popup column filters across all Dashboard grids — replaced remaining TextBox-in-header filters and added filters to Trace Flags ([#200])
+- 7-day time filter option in drill-down queries ([#165])
+- Alert badge/count on sidebar Alerts button ([#109])
+- Missing poison wait defaults in wait stats picker ([#188])
+
+### Changed
+
+- Default Trace tabs moved from Resource Metrics to Overview section ([#169])
+- Trends tab shown first in Locking section ([#171])
+- Wait stats cap raised from 20 to 30 (Dashboard) / 50 (Lite) so poison waits are never dropped ([#139])
+- Settings time range dropdown now matches dashboard button options ([#210])
+- "Total Executions" label in drill-down summaries renamed to clarify meaning ([#194])
+- WAITFOR sessions excluded from long-running query alerts ([#151])
+
+### Fixed
+
+- Deadlock XML processor timezone mismatch — sp_BlitzLock returning 0 results because UTC dates were passed instead of local time
+- Sidebar alert badge not updating when alerts dismissed from server sub-tabs ([#214])
+- Sidebar alert badge not clearing on acknowledge ([#186])
+- NOC deadlock/blocking showing "just now" for stale events instead of actual timestamp ([#187])
+- NOC deadlock severity using extended events timestamp ([#170])
+- Newly added servers not appearing on Overview until app restart ([#199])
+- Double-click on column header incorrectly triggering row drill-down ([#195])
+- Squished drill-down charts — now use proportional sizing ([#166])
+- Unreliable chart tooltips — now use X-axis proximity matching ([#167])
+- Query Trace Patterns showing empty despite data existing ([#168])
+- Drill-down windows: removed inline plan XML, added time range filtering, aggregated by collection_time ([#189])
+- Row clipping in Default Trace and Current Configuration grids ([#183], [#184])
+- Numeric filter negative range parsing ([#113])
+- MCP shutdown deadlock risk ([#112])
+- Lite DBNull cast error in database_config collector on SQL 2016 Express ([#192])
+- DuckDB concurrent file access IO errors ([#164])
+
+## [1.2.0] - 2026-02-15
+
+### Added
+
+- Alert types, alerts history view, column filtering, and dismiss/hide for alerts ([#52], [#56])
+- Average ms per wait chart toggle in both apps ([#22])
+- Collection Health tab in Lite UI ([#39])
+- Collector performance diagnostics in Lite UI ([#40])
+- Hover tooltips on all Dashboard charts ([#70])
+- Minimize-to-tray setting added to Lite ([#53])
+- Persist dismissed alerts across app restarts ([#44])
+- Locale-aware date/time formatting throughout UI ([#41])
+- 24-hour format in time range picker ([#41])
+- CI pipelines for build validation, SQL install testing, and DuckDB schema tests
+- Expanded Lite database config collector to 28 sys.databases columns ([#142])
+- Parquet archive visibility and scheduled DuckDB database compaction ([#160], [#161])
+- DuckDB checkpoint optimization and collection timing accuracy
+- Installer `--reset-schedule` flag to reset collection schedule on re-install
+
+### Fixed
+
+- Deadlock charts not populating data ([#73])
+- Chart X-axis double-converting custom range to server time ([#49])
+- query_cost overflow in memory grant collector ([#47])
+- XE ring buffer query timeouts on large buffers ([#37])
+- Dashboard sub-tab badge state and DuckDB migration for dismissed column
+- Lite duplicate blocking/deadlock events from missing WHERE clause ([#61])
+- Procedure_stats_collector truncation on DDL triggers ([#69])
+- DataGrid row height increased from 25 to 28 to fix text clipping
+- Skip offline servers during Lite collection and reduce connection timeout ([#90])
+- Mutex crash on Lite app exit ([#89])
+- Permission denied errors handled gracefully in collector health ([#150])
+
 ## [1.1.0] - 2026-02-13
 
 ### Added
@@ -42,6 +119,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Delta normalization for per-second rate calculations
 - Dark theme UI
 
+[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
 [1.0.0]: https://github.com/erikdarlingdata/PerformanceMonitor/releases/tag/v1.0.0
 [#1]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/1
@@ -54,5 +133,57 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#18]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/18
 [#20]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/20
 [#21]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/21
+[#22]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/22
 [#23]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/23
 [#25]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/25
+[#37]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/37
+[#39]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/39
+[#40]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/40
+[#41]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/41
+[#44]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/44
+[#47]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/47
+[#49]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/49
+[#52]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/52
+[#53]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/53
+[#56]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/56
+[#61]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/61
+[#69]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/69
+[#70]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/70
+[#73]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/73
+[#85]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/85
+[#86]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/86
+[#89]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/89
+[#90]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/90
+[#109]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/109
+[#112]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/112
+[#113]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/113
+[#139]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/139
+[#140]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/140
+[#142]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/142
+[#143]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/143
+[#150]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/150
+[#151]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/151
+[#160]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/160
+[#161]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/161
+[#164]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/164
+[#165]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/165
+[#166]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/166
+[#167]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/167
+[#168]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/168
+[#169]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/169
+[#170]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/170
+[#171]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/171
+[#183]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/183
+[#184]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/184
+[#186]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/186
+[#187]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/187
+[#188]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/188
+[#189]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/189
+[#192]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/192
+[#194]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/194
+[#195]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/195
+[#199]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/199
+[#200]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/200
+[#206]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/206
+[#210]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/210
+[#214]: https://github.com/erikdarlingdata/PerformanceMonitor/issues/214
diff --git a/Dashboard/App.xaml.cs b/Dashboard/App.xaml.cs
index 1a17661f..54af8047 100644
--- a/Dashboard/App.xaml.cs
+++ b/Dashboard/App.xaml.cs
@@ -20,13 +20,14 @@ public partial class App : Application
     {
         private const string MutexName = "PerformanceMonitorDashboard_SingleInstance";
         private Mutex? _singleInstanceMutex;
+        private bool _ownsMutex;
 
         protected override void OnStartup(StartupEventArgs e)
         {
             // Check for existing instance
-            _singleInstanceMutex = new Mutex(true, MutexName, out bool isNewInstance);
+            _singleInstanceMutex = new Mutex(true, MutexName, out _ownsMutex);
 
-            if (!isNewInstance)
+            if (!_ownsMutex)
             {
                 // Another instance is already running - activate it and exit
                 NativeMethods.BroadcastShowMessage();
@@ -58,8 +59,10 @@ protected override void OnExit(ExitEventArgs e)
                 mainWin.ExitApplication();
             }
 
-            // Release the mutex
-            _singleInstanceMutex?.ReleaseMutex();
+            if (_ownsMutex)
+            {
+                _singleInstanceMutex?.ReleaseMutex();
+            }
             _singleInstanceMutex?.Dispose();
 
             base.OnExit(e);
diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml.cs b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
index 9741b2aa..132cb1d8 100644
--- a/Dashboard/Controls/AlertsHistoryContent.xaml.cs
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
@@ -23,6 +23,8 @@ namespace PerformanceMonitorDashboard.Controls
 {
     public partial class AlertsHistoryContent : UserControl
     {
+        public event EventHandler? AlertsDismissed;
+
         private List<AlertHistoryDisplayItem> _allAlerts = new();
 
         /* Column filter state */
@@ -219,6 +221,7 @@ private void DismissSelected_Click(object sender, RoutedEventArgs e)
 
             service.HideAlerts(keys);
             LoadAlerts();
+            AlertsDismissed?.Invoke(this, EventArgs.Empty);
         }
 
         private void DismissAll_Click(object sender, RoutedEventArgs e)
@@ -247,6 +250,7 @@ private void DismissAll_Click(object sender, RoutedEventArgs e)
 
             service.HideAllAlerts(hoursBack > 0 ? hoursBack : 8760, serverName);
             LoadAlerts();
+            AlertsDismissed?.Invoke(this, EventArgs.Empty);
         }
 
         #endregion
diff --git a/Dashboard/Controls/CurrentConfigContent.xaml b/Dashboard/Controls/CurrentConfigContent.xaml
new file mode 100644
index 00000000..1a42ce54
--- /dev/null
+++ b/Dashboard/Controls/CurrentConfigContent.xaml
@@ -0,0 +1,201 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.CurrentConfigContent"
+             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">
+    <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">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ConfigurationName}" Width="220">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ConfigurationName" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ValueConfigured}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ValueConfigured" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Configured" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ValueInUse}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ValueInUse" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="In Use" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ValueMinimum}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ValueMinimum" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Minimum" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ValueMaximum}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ValueMaximum" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Maximum" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsDynamic}" Width="65">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IsDynamic" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Dynamic" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsAdvanced}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IsAdvanced" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Advanced" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridTextColumn Binding="{Binding LastChanged, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastChanged" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Last Changed" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Description}" Width="*" MinWidth="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Description" Click="ServerConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="ServerConfigNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+
+        <!-- Current Database Configuration Sub-Tab -->
+        <TabItem Header="Database Configuration">
+            <Grid>
+            <DataGrid x:Name="DatabaseConfigDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="DatabaseConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingType}" Width="160">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingType" Click="DatabaseConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingName}" Width="220">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingName" Click="DatabaseConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Name" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingValue}" Width="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingValue" Click="DatabaseConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding LastChanged, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastChanged" Click="DatabaseConfigFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Last Changed" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="DatabaseConfigNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+
+        <!-- Current Trace Flags Sub-Tab -->
+        <TabItem Header="Trace Flags">
+            <Grid>
+            <DataGrid x:Name="TraceFlagsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding TraceFlag}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Trace Flag" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding Status}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Status" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Enabled" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsGlobal}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IsGlobal" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Global" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsSession}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IsSession" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Session" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridTextColumn Binding="{Binding LastChanged, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastChanged" Click="TraceFlagsFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Last Changed" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="TraceFlagsNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+    </TabControl>
+</UserControl>
diff --git a/Dashboard/Controls/CurrentConfigContent.xaml.cs b/Dashboard/Controls/CurrentConfigContent.xaml.cs
new file mode 100644
index 00000000..85d98e4b
--- /dev/null
+++ b/Dashboard/Controls/CurrentConfigContent.xaml.cs
@@ -0,0 +1,282 @@
+/*
+ * 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 CurrentConfigContent : UserControl
+    {
+        private DatabaseService? _databaseService;
+
+        // Popup filter state (shared popup, per-grid filter dictionaries)
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+        private string? _activeFilterGrid;
+
+        private readonly Dictionary<string, ColumnFilterState> _serverConfigFilters = new();
+        private List<CurrentServerConfigItem>? _serverConfigUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _databaseConfigFilters = new();
+        private List<CurrentDatabaseConfigItem>? _databaseConfigUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _traceFlagsFilters = new();
+        private List<CurrentTraceFlagItem>? _traceFlagsUnfilteredData;
+
+        public CurrentConfigContent()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(DatabaseService databaseService)
+        {
+            _databaseService = databaseService;
+        }
+
+        public async Task RefreshAllDataAsync()
+        {
+            if (_databaseService == null) return;
+
+            await Task.WhenAll(
+                RefreshServerConfigAsync(),
+                RefreshDatabaseConfigAsync(),
+                RefreshTraceFlagsAsync()
+            );
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            TabHelpers.AutoSizeColumnMinWidths(ServerConfigDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(DatabaseConfigDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(TraceFlagsDataGrid);
+            TabHelpers.FreezeColumns(ServerConfigDataGrid, 1);
+            TabHelpers.FreezeColumns(DatabaseConfigDataGrid, 1);
+        }
+
+        #region Server Configuration
+
+        private async Task RefreshServerConfigAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetCurrentServerConfigAsync();
+                _serverConfigUnfilteredData = data;
+                _serverConfigFilters.Clear();
+                ServerConfigDataGrid.ItemsSource = data;
+                ServerConfigNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(ServerConfigDataGrid, _serverConfigFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading server configuration: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region Database Configuration
+
+        private async Task RefreshDatabaseConfigAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetCurrentDatabaseConfigAsync();
+                _databaseConfigUnfilteredData = data;
+                _databaseConfigFilters.Clear();
+                DatabaseConfigDataGrid.ItemsSource = data;
+                DatabaseConfigNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(DatabaseConfigDataGrid, _databaseConfigFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading database configuration: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region Trace Flags
+
+        private async Task RefreshTraceFlagsAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetCurrentTraceFlagsAsync();
+                _traceFlagsUnfilteredData = data;
+                _traceFlagsFilters.Clear();
+                TraceFlagsDataGrid.ItemsSource = data;
+                TraceFlagsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(TraceFlagsDataGrid, _traceFlagsFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading trace flags: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region Popup Filter Infrastructure
+
+        private void ServerConfigFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "ServerConfig";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _serverConfigFilters);
+        }
+
+        private void DatabaseConfigFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "DatabaseConfig";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _databaseConfigFilters);
+        }
+
+        private void TraceFlagsFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "TraceFlags";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _traceFlagsFilters);
+        }
+
+        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 "ServerConfig":
+                    if (e.FilterState.IsActive)
+                        _serverConfigFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _serverConfigFilters.Remove(e.FilterState.ColumnName);
+                    ApplyFilters(_serverConfigFilters, _serverConfigUnfilteredData, ServerConfigDataGrid, ServerConfigNoDataMessage);
+                    UpdateFilterButtonStyles(ServerConfigDataGrid, _serverConfigFilters);
+                    break;
+
+                case "DatabaseConfig":
+                    if (e.FilterState.IsActive)
+                        _databaseConfigFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _databaseConfigFilters.Remove(e.FilterState.ColumnName);
+                    ApplyFilters(_databaseConfigFilters, _databaseConfigUnfilteredData, DatabaseConfigDataGrid, DatabaseConfigNoDataMessage);
+                    UpdateFilterButtonStyles(DatabaseConfigDataGrid, _databaseConfigFilters);
+                    break;
+
+                case "TraceFlags":
+                    if (e.FilterState.IsActive)
+                        _traceFlagsFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _traceFlagsFilters.Remove(e.FilterState.ColumnName);
+                    ApplyFilters(_traceFlagsFilters, _traceFlagsUnfilteredData, TraceFlagsDataGrid, TraceFlagsNoDataMessage);
+                    UpdateFilterButtonStyles(TraceFlagsDataGrid, _traceFlagsFilters);
+                    break;
+            }
+        }
+
+        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+        }
+
+        private static void ApplyFilters<T>(Dictionary<string, ColumnFilterState> filters, List<T>? unfilteredData, DataGrid grid, TextBlock noDataMessage)
+        {
+            if (unfilteredData == null) return;
+
+            if (filters.Count == 0)
+            {
+                grid.ItemsSource = unfilteredData;
+                noDataMessage.Visibility = unfilteredData.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                return;
+            }
+
+            var filtered = unfilteredData.Where(item =>
+            {
+                foreach (var filter in filters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item!, filter))
+                        return false;
+                }
+                return true;
+            }).ToList();
+
+            grid.ItemsSource = filtered;
+            noDataMessage.Visibility = filtered.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        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
+    }
+}
diff --git a/Dashboard/Controls/DefaultTraceContent.xaml b/Dashboard/Controls/DefaultTraceContent.xaml
new file mode 100644
index 00000000..332d4d89
--- /dev/null
+++ b/Dashboard/Controls/DefaultTraceContent.xaml
@@ -0,0 +1,187 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.DefaultTraceContent"
+             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">
+    <TabControl>
+        <!-- Default Trace Events Sub-Tab -->
+        <TabItem Header="Default Trace Events">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10" Background="{DynamicResource BackgroundLightBrush}">
+                    <TextBlock Text="Event Filter:" VerticalAlignment="Center" Margin="5,0" FontWeight="Bold"/>
+                    <ComboBox x:Name="DefaultTraceEventsFilterCombo" Width="200" Margin="2,0" SelectionChanged="DefaultTraceEventsFilter_Changed">
+                        <ComboBoxItem Content="All Events" Tag="" IsSelected="True"/>
+                        <ComboBoxItem Content="Object:Altered" Tag="%Object:Altered%"/>
+                        <ComboBoxItem Content="Object:Created" Tag="%Object:Created%"/>
+                        <ComboBoxItem Content="Object:Deleted" Tag="%Object:Deleted%"/>
+                        <ComboBoxItem Content="Audit%" Tag="Audit%"/>
+                        <ComboBoxItem Content="Database%" Tag="Database%"/>
+                        <ComboBoxItem Content="ErrorLog" Tag="%ErrorLog%"/>
+                        <ComboBoxItem Content="Security%" Tag="Security%"/>
+                    </ComboBox>
+                    <Separator Margin="10,0" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
+                    <Button Content="Refresh" Click="DefaultTraceEvents_Refresh_Click" Margin="5,0" Padding="10,4" Style="{DynamicResource SuccessButton}"/>
+                </StackPanel>
+
+                <Grid Grid.Row="1">
+                <DataGrid x:Name="DefaultTraceEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                          RowHeight="28" 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">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventTime" Click="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Event Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding EventName}" Width="150">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventName" Click="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Event Name" 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="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding ObjectName}" Width="150">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ObjectName" Click="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Object Name" 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="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Login" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding TextData}" Width="300">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TextData" Click="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Text Data" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding Severity}" Width="60">
+                            <DataGridTextColumn.Header>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Severity" Click="DefaultTraceFilter_Click" Margin="0,0,4,0"/>
+                                    <TextBlock Text="Severity" FontWeight="Bold" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
+                <TextBlock x:Name="DefaultTraceEventsNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+                </Grid>
+            </Grid>
+        </TabItem>
+
+        <!-- Trace Analysis Sub-Tab -->
+        <TabItem Header="Trace Analysis">
+            <Grid>
+            <DataGrid x:Name="TraceAnalysisDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" 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">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Collected" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding EventName}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EventName" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Event Name" 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="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding LoginName}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LoginName" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Login" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding DurationMs, StringFormat=N0}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DurationMs" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding CpuMs, StringFormat=N0}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CpuMs" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Reads" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Reads (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Writes" Click="TraceAnalysisFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Writes (pages)" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SqlText}" Width="400">
+                        <DataGridTextColumn.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>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="TraceAnalysisNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+    </TabControl>
+</UserControl>
diff --git a/Dashboard/Controls/DefaultTraceContent.xaml.cs b/Dashboard/Controls/DefaultTraceContent.xaml.cs
new file mode 100644
index 00000000..44a68229
--- /dev/null
+++ b/Dashboard/Controls/DefaultTraceContent.xaml.cs
@@ -0,0 +1,283 @@
+/*
+ * 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 DefaultTraceContent : UserControl
+    {
+        private DatabaseService? _databaseService;
+
+        private int _defaultTraceEventsHoursBack = 24;
+        private DateTime? _defaultTraceEventsFromDate;
+        private DateTime? _defaultTraceEventsToDate;
+        private string? _defaultTraceEventsFilter;
+
+        private int _traceAnalysisHoursBack = 24;
+        private DateTime? _traceAnalysisFromDate;
+        private DateTime? _traceAnalysisToDate;
+
+        // Popup filter state (shared popup, per-grid filter dictionaries)
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+        private string? _activeFilterGrid;
+
+        private readonly Dictionary<string, ColumnFilterState> _defaultTraceFilters = new();
+        private List<DefaultTraceEventItem>? _defaultTraceUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _traceAnalysisFilters = new();
+        private List<TraceAnalysisItem>? _traceAnalysisUnfilteredData;
+
+        public DefaultTraceContent()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(DatabaseService databaseService)
+        {
+            _databaseService = databaseService;
+        }
+
+        public void SetTimeRange(int hoursBack, DateTime? fromDate = null, DateTime? toDate = null)
+        {
+            _defaultTraceEventsHoursBack = hoursBack;
+            _defaultTraceEventsFromDate = fromDate;
+            _defaultTraceEventsToDate = toDate;
+
+            _traceAnalysisHoursBack = hoursBack;
+            _traceAnalysisFromDate = fromDate;
+            _traceAnalysisToDate = toDate;
+        }
+
+        public async Task RefreshAllDataAsync()
+        {
+            if (_databaseService == null) return;
+
+            await Task.WhenAll(
+                RefreshDefaultTraceEventsAsync(),
+                RefreshTraceAnalysisAsync()
+            );
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            TabHelpers.AutoSizeColumnMinWidths(DefaultTraceEventsDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(TraceAnalysisDataGrid);
+            TabHelpers.FreezeColumns(DefaultTraceEventsDataGrid, 1);
+            TabHelpers.FreezeColumns(TraceAnalysisDataGrid, 1);
+        }
+
+        #region Default Trace Events
+
+        private void DefaultTraceEventsFilter_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            if (DefaultTraceEventsFilterCombo.SelectedItem is ComboBoxItem selected)
+            {
+                _defaultTraceEventsFilter = selected.Tag?.ToString();
+                if (string.IsNullOrEmpty(_defaultTraceEventsFilter))
+                {
+                    _defaultTraceEventsFilter = null;
+                }
+                DefaultTraceEvents_Refresh_Click(sender, new RoutedEventArgs());
+            }
+        }
+
+        private async void DefaultTraceEvents_Refresh_Click(object? sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await RefreshDefaultTraceEventsAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error refreshing Default Trace Events data: {ex.Message}", ex);
+            }
+        }
+
+        private async Task RefreshDefaultTraceEventsAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetDefaultTraceEventsAsync(_defaultTraceEventsHoursBack, _defaultTraceEventsFromDate, _defaultTraceEventsToDate, _defaultTraceEventsFilter);
+                _defaultTraceUnfilteredData = data;
+                _defaultTraceFilters.Clear();
+                DefaultTraceEventsDataGrid.ItemsSource = data;
+                DefaultTraceEventsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(DefaultTraceEventsDataGrid, _defaultTraceFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading default trace events: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region Trace Analysis
+
+        private async Task RefreshTraceAnalysisAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetTraceAnalysisAsync(_traceAnalysisHoursBack, _traceAnalysisFromDate, _traceAnalysisToDate);
+                _traceAnalysisUnfilteredData = data;
+                _traceAnalysisFilters.Clear();
+                TraceAnalysisDataGrid.ItemsSource = data;
+                TraceAnalysisNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(TraceAnalysisDataGrid, _traceAnalysisFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading trace analysis: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region Popup Filter Infrastructure
+
+        private void DefaultTraceFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "DefaultTrace";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _defaultTraceFilters);
+        }
+
+        private void TraceAnalysisFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "TraceAnalysis";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _traceAnalysisFilters);
+        }
+
+        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 "DefaultTrace":
+                    if (e.FilterState.IsActive)
+                        _defaultTraceFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _defaultTraceFilters.Remove(e.FilterState.ColumnName);
+                    ApplyFilters(_defaultTraceFilters, _defaultTraceUnfilteredData, DefaultTraceEventsDataGrid, DefaultTraceEventsNoDataMessage);
+                    UpdateFilterButtonStyles(DefaultTraceEventsDataGrid, _defaultTraceFilters);
+                    break;
+
+                case "TraceAnalysis":
+                    if (e.FilterState.IsActive)
+                        _traceAnalysisFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _traceAnalysisFilters.Remove(e.FilterState.ColumnName);
+                    ApplyFilters(_traceAnalysisFilters, _traceAnalysisUnfilteredData, TraceAnalysisDataGrid, TraceAnalysisNoDataMessage);
+                    UpdateFilterButtonStyles(TraceAnalysisDataGrid, _traceAnalysisFilters);
+                    break;
+            }
+        }
+
+        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+        }
+
+        private static void ApplyFilters<T>(Dictionary<string, ColumnFilterState> filters, List<T>? unfilteredData, DataGrid grid, TextBlock noDataMessage)
+        {
+            if (unfilteredData == null) return;
+
+            if (filters.Count == 0)
+            {
+                grid.ItemsSource = unfilteredData;
+                noDataMessage.Visibility = unfilteredData.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                return;
+            }
+
+            var filtered = unfilteredData.Where(item =>
+            {
+                foreach (var filter in filters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item!, filter))
+                        return false;
+                }
+                return true;
+            }).ToList();
+
+            grid.ItemsSource = filtered;
+            noDataMessage.Visibility = filtered.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        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
+    }
+}
diff --git a/Dashboard/Controls/LandingPage.xaml.cs b/Dashboard/Controls/LandingPage.xaml.cs
index 0355b270..3e35e23a 100644
--- a/Dashboard/Controls/LandingPage.xaml.cs
+++ b/Dashboard/Controls/LandingPage.xaml.cs
@@ -30,11 +30,11 @@ public partial class LandingPage : UserControl
 
         public event EventHandler<ServerConnection>? ServerCardClicked;
 
-        public LandingPage()
+        public LandingPage(ServerManager? serverManager = null)
         {
             InitializeComponent();
 
-            _serverManager = new ServerManager();
+            _serverManager = serverManager ?? new ServerManager();
             _preferencesService = new UserPreferencesService();
             _credentialService = new CredentialService();
             _serverHealthStatuses = new ObservableCollection<ServerHealthStatus>();
diff --git a/Dashboard/Controls/MemoryContent.xaml b/Dashboard/Controls/MemoryContent.xaml
index bae6cf3b..d157b62a 100644
--- a/Dashboard/Controls/MemoryContent.xaml
+++ b/Dashboard/Controls/MemoryContent.xaml
@@ -49,18 +49,45 @@
                     </Grid.RowDefinitions>
                     <TextBlock Grid.Row="0" Text="Memory Usage Over Time" FontWeight="Bold" FontSize="14" Margin="10,5" Foreground="{DynamicResource ForegroundBrush}"/>
                     <ScottPlot:WpfPlot Grid.Row="1" x:Name="MemoryStatsOverviewChart"/>
-                    <!-- Summary Panel for percentages and pressure status -->
-                    <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="Buffer Pool:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryStatsBPPercentText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                            <TextBlock Text="Plan Cache:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryStatsPCPercentText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                            <TextBlock Text="Utilization:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryStatsUtilPercentText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center" Margin="0,0,20,0"/>
-                            <TextBlock Text="Pressure:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
-                            <TextBlock x:Name="MemoryStatsPressureText" Text="None" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
-                        </StackPanel>
+                    <!-- Summary Panel with absolute GB values and pressure status -->
+                    <Border Grid.Row="2" Background="{DynamicResource BackgroundBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,1,0,0" Padding="10,6">
+                        <WrapPanel HorizontalAlignment="Center">
+                            <!-- Physical Memory -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,24,0">
+                                <TextBlock Text="Physical Memory:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsPhysicalText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <!-- SQL Server Memory (committed) -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,24,0">
+                                <TextBlock Text="SQL Server Memory:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsSqlServerText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <!-- Target Memory -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,24,0">
+                                <TextBlock Text="Target Memory:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsTargetText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <!-- Buffer Pool -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,24,0">
+                                <TextBlock Text="Buffer Pool:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsBPPercentText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <!-- Plan Cache -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,24,0">
+                                <TextBlock Text="Plan Cache:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsPCPercentText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <!-- Utilization -->
+                            <StackPanel Orientation="Horizontal" Margin="0,0,24,0">
+                                <TextBlock Text="Utilization:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsUtilPercentText" Text="N/A" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                            <!-- Pressure -->
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Pressure:" FontWeight="SemiBold" Foreground="{DynamicResource ForegroundDimBrush}" VerticalAlignment="Center" Margin="0,0,5,0"/>
+                                <TextBlock x:Name="MemoryStatsPressureText" Text="None" Foreground="{DynamicResource ForegroundBrush}" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </WrapPanel>
                     </Border>
                 </Grid>
             </Border>
diff --git a/Dashboard/Controls/MemoryContent.xaml.cs b/Dashboard/Controls/MemoryContent.xaml.cs
index 2ce4ee10..5ce7ee3b 100644
--- a/Dashboard/Controls/MemoryContent.xaml.cs
+++ b/Dashboard/Controls/MemoryContent.xaml.cs
@@ -333,6 +333,9 @@ private void UpdateMemoryStatsSummaryPanel(List<MemoryStatsItem> dataList)
         {
             if (dataList == null || dataList.Count == 0)
             {
+                MemoryStatsPhysicalText.Text = "N/A";
+                MemoryStatsSqlServerText.Text = "N/A";
+                MemoryStatsTargetText.Text = "N/A";
                 MemoryStatsBPPercentText.Text = "N/A";
                 MemoryStatsPCPercentText.Text = "N/A";
                 MemoryStatsUtilPercentText.Text = "N/A";
@@ -344,14 +347,26 @@ private void UpdateMemoryStatsSummaryPanel(List<MemoryStatsItem> dataList)
             // Use the most recent data point
             var latest = dataList.OrderByDescending(d => d.CollectionTime).First();
 
-            MemoryStatsBPPercentText.Text = latest.BufferPoolPercentage.HasValue
-                ? $"{latest.BufferPoolPercentage:F1}%"
+            // Absolute GB values
+            MemoryStatsPhysicalText.Text = latest.TotalPhysicalMemoryMb.HasValue
+                ? $"{latest.TotalPhysicalMemoryMb.Value / 1024.0m:F1} GB"
                 : "N/A";
 
-            MemoryStatsPCPercentText.Text = latest.PlanCachePercentage.HasValue
-                ? $"{latest.PlanCachePercentage:F1}%"
+            MemoryStatsSqlServerText.Text = $"{latest.PhysicalMemoryInUseMb / 1024.0m:F1} GB";
+
+            MemoryStatsTargetText.Text = latest.CommittedTargetMemoryMb.HasValue
+                ? $"{latest.CommittedTargetMemoryMb.Value / 1024.0m:F1} GB"
                 : "N/A";
 
+            // Buffer Pool and Plan Cache with GB and percentage
+            MemoryStatsBPPercentText.Text = latest.BufferPoolPercentage.HasValue
+                ? $"{latest.BufferPoolMb / 1024.0m:F1} GB ({latest.BufferPoolPercentage:F1}%)"
+                : $"{latest.BufferPoolMb / 1024.0m:F1} GB";
+
+            MemoryStatsPCPercentText.Text = latest.PlanCachePercentage.HasValue
+                ? $"{latest.PlanCacheMb / 1024.0m:F1} GB ({latest.PlanCachePercentage:F1}%)"
+                : $"{latest.PlanCacheMb / 1024.0m:F1} GB";
+
             MemoryStatsUtilPercentText.Text = $"{latest.MemoryUtilizationPercentage}%";
 
             // Build pressure status text
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml.cs b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
index 7cefe544..59d59287 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml.cs
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
@@ -761,6 +761,7 @@ private void ApplyQueryStoreFilters()
 
         private void QueryStoreDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
+            if (!TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
             if (_databaseService == null) return;
 
             if (QueryStoreDataGrid.SelectedItem is QueryStoreItem item)
@@ -781,7 +782,10 @@ private void QueryStoreDataGrid_MouseDoubleClick(object sender, MouseButtonEvent
                     _databaseService,
                     item.DatabaseName,
                     item.QueryId,
-                    "Query Store"
+                    "Query Store",
+                    _queryStoreHoursBack,
+                    _queryStoreFromDate,
+                    _queryStoreToDate
                 );
                 historyWindow.Owner = Window.GetWindow(this);
                 historyWindow.ShowDialog();
@@ -790,6 +794,7 @@ private void QueryStoreDataGrid_MouseDoubleClick(object sender, MouseButtonEvent
 
         private void ProcStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
+            if (!TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
             if (_databaseService == null) return;
 
             if (ProcStatsDataGrid.SelectedItem is ProcedureStatsItem item)
@@ -810,7 +815,10 @@ private void ProcStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEventA
                     _databaseService,
                     item.DatabaseName,
                     item.ObjectId,
-                    item.FullObjectName ?? item.ObjectName ?? $"ObjectId_{item.ObjectId}"
+                    item.FullObjectName ?? item.ObjectName ?? $"ObjectId_{item.ObjectId}",
+                    _procStatsHoursBack,
+                    _procStatsFromDate,
+                    _procStatsToDate
                 );
                 historyWindow.Owner = Window.GetWindow(this);
                 historyWindow.ShowDialog();
@@ -819,6 +827,7 @@ private void ProcStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEventA
 
         private void QueryStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
+            if (!TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
             if (_databaseService == null) return;
 
             if (QueryStatsDataGrid.SelectedItem is QueryStatsItem item)
@@ -838,7 +847,10 @@ private void QueryStatsDataGrid_MouseDoubleClick(object sender, MouseButtonEvent
                 var historyWindow = new QueryStatsHistoryWindow(
                     _databaseService,
                     item.DatabaseName,
-                    item.QueryHash
+                    item.QueryHash,
+                    _queryStatsHoursBack,
+                    _queryStatsFromDate,
+                    _queryStatsToDate
                 );
                 historyWindow.Owner = Window.GetWindow(this);
                 historyWindow.ShowDialog();
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml b/Dashboard/Controls/ResourceMetricsContent.xaml
index 9694d495..4eeb5f6c 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml
@@ -112,7 +112,7 @@
                         <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5,2">
                             <Button Content="Top Waits" Click="WaitTypes_SelectAll_Click" Padding="6,2" FontSize="10" Margin="0,0,5,0"/>
                             <Button Content="Clear All" Click="WaitTypes_ClearAll_Click" Padding="6,2" FontSize="10"/>
-                            <TextBlock x:Name="WaitTypeCountText" Text="0 / 20 selected" FontSize="10" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                            <TextBlock x:Name="WaitTypeCountText" Text="0 / 30 selected" FontSize="10" Foreground="{DynamicResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
                         </StackPanel>
                         <TextBox Grid.Row="2" x:Name="WaitTypeSearchBox" Margin="5,2" Height="24" FontSize="11"
                                  TextChanged="WaitTypeSearch_TextChanged"
@@ -295,183 +295,6 @@
             </Grid>
         </TabItem>
 
-        <!-- Default Trace Events Sub-Tab -->
-        <TabItem Header="Default Trace Events">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-
-                <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10" Background="{DynamicResource BackgroundLightBrush}">
-                    <TextBlock Text="Event Filter:" VerticalAlignment="Center" Margin="5,0" FontWeight="Bold"/>
-                    <ComboBox x:Name="DefaultTraceEventsFilterCombo" Width="200" Margin="2,0" SelectionChanged="DefaultTraceEventsFilter_Changed">
-                        <ComboBoxItem Content="All Events" Tag="" IsSelected="True"/>
-                        <ComboBoxItem Content="Object:Altered" Tag="%Object:Altered%"/>
-                        <ComboBoxItem Content="Object:Created" Tag="%Object:Created%"/>
-                        <ComboBoxItem Content="Object:Deleted" Tag="%Object:Deleted%"/>
-                        <ComboBoxItem Content="Audit%" Tag="Audit%"/>
-                        <ComboBoxItem Content="Database%" Tag="Database%"/>
-                        <ComboBoxItem Content="ErrorLog" Tag="%ErrorLog%"/>
-                        <ComboBoxItem Content="Security%" Tag="Security%"/>
-                    </ComboBox>
-                    <Separator Margin="10,0" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
-                    <Button Content="Refresh" Click="DefaultTraceEvents_Refresh_Click" Margin="5,0" Padding="10,4" Style="{StaticResource SuccessButton}"/>
-                </StackPanel>
-
-                <Grid Grid.Row="1">
-                <DataGrid x:Name="DefaultTraceEventsDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                          RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{StaticResource 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">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Event Time" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="EventTime"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding EventName}" Width="150">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Event Name" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="EventName"/>
-                                </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" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="DatabaseName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding ObjectName}" Width="150">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Object Name" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="140" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="ObjectName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding LoginName}" Width="120">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Login" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="110" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="LoginName"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding TextData}" Width="300">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Text Data" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="290" Height="22" FontSize="11" TextChanged="DefaultTraceEventsFilterTextBox_TextChanged" Tag="TextData"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding Severity}" Width="60">
-                            <DataGridTextColumn.Header>
-                                <StackPanel>
-                                    <TextBlock Text="Severity" FontWeight="Bold" Margin="0,0,0,2"/>
-                                    <TextBox Width="50" Height="22" FontSize="11" TextChanged="DefaultTraceEventsNumericFilterTextBox_TextChanged" Tag="Severity"/>
-                                </StackPanel>
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-                <TextBlock x:Name="DefaultTraceEventsNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                </Grid>
-            </Grid>
-        </TabItem>
-
-        <!-- Trace Analysis Sub-Tab -->
-        <TabItem Header="Trace Analysis">
-            <Grid>
-            <DataGrid x:Name="TraceAnalysisDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                      RowHeight="25" GridLinesVisibility="Horizontal" CanUserResizeColumns="True" ContextMenu="{StaticResource 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">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Collected" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="CollectionTime"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding EventName}" Width="150">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Event Name" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="140" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="EventName"/>
-                            </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" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="DatabaseName"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding LoginName}" Width="100">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Login" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="90" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="LoginName"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding DurationMs, StringFormat=N0}" Width="90">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Duration (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="DurationMs"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding CpuMs, StringFormat=N0}" Width="80">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="CPU (ms)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="70" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="CpuMs"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Reads, StringFormat=N0}" Width="90">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Reads (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="Reads"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Writes, StringFormat=N0}" Width="90">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="Writes (pages)" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="80" Height="22" FontSize="11" TextChanged="TraceAnalysisNumericFilterTextBox_TextChanged" Tag="Writes"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding SqlText}" Width="400">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="SQL Text" FontWeight="Bold" Margin="0,0,0,2"/>
-                                <TextBox Width="390" Height="22" FontSize="11" TextChanged="TraceAnalysisFilterTextBox_TextChanged" Tag="SqlText"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-            <TextBlock x:Name="TraceAnalysisNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-            </Grid>
-        </TabItem>
-
         <!-- Session Stats Sub-Tab -->
         <TabItem Header="Session Stats">
             <!-- Session Stats Chart -->
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 119fcdc1..3665466f 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -16,7 +16,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 using Microsoft.Win32;
 using PerformanceMonitorDashboard.Models;
@@ -29,7 +28,7 @@ namespace PerformanceMonitorDashboard.Controls
     /// <summary>
     /// UserControl for the Resource Metrics tab content.
     /// Displays Latch Stats, Spinlock Stats, TempDB Stats, CPU Spikes, Session Stats,
-    /// File I/O Latency, Server Trends, Perfmon Counters, Default Trace Events, and Trace Analysis.
+    /// File I/O Latency, Server Trends, and Perfmon Counters.
     /// </summary>
     public partial class ResourceMetricsContent : UserControl
     {
@@ -75,16 +74,6 @@ public partial class ResourceMetricsContent : UserControl
         private List<PerfmonStatsItem>? _allPerfmonCountersData;
         private List<PerfmonCounterSelectionItem>? _perfmonCounterItems;
 
-        // Default Trace Events state
-        private int _defaultTraceEventsHoursBack = 24;
-        private DateTime? _defaultTraceEventsFromDate;
-        private DateTime? _defaultTraceEventsToDate;
-
-        // Trace Analysis state
-        private int _traceAnalysisHoursBack = 24;
-        private DateTime? _traceAnalysisFromDate;
-        private DateTime? _traceAnalysisToDate;
-
         // Wait Stats Detail state
         private int _waitStatsDetailHoursBack = 24;
         private DateTime? _waitStatsDetailFromDate;
@@ -105,19 +94,7 @@ public partial class ResourceMetricsContent : UserControl
         private Helpers.ChartHoverHelper? _serverTrendsTempdbHover;
         private Helpers.ChartHoverHelper? _serverTrendsMemoryHover;
         private Helpers.ChartHoverHelper? _serverTrendsPerfmonHover;
-        // Column filter popup and state
-        private Popup? _filterPopup;
-        private ColumnFilterPopup? _filterPopupContent;
-        private string? _currentFilterDataGridName;
-
         // Filter state dictionaries for each DataGrid
-        private Dictionary<string, ColumnFilterState> _defaultTraceEventsFilters = new();
-        private Dictionary<string, ColumnFilterState> _traceAnalysisFilters = new();
-
-        // Unfiltered data for each DataGrid
-        private List<DefaultTraceEventItem>? _defaultTraceEventsUnfilteredData;
-        private List<TraceAnalysisItem>? _traceAnalysisUnfilteredData;
-
         // Legend panel references for edge-based legends (ScottPlot issue #4717 workaround)
         // Must store and remove these by reference before creating new ones
         private Dictionary<ScottPlot.WPF.WpfPlot, ScottPlot.IPanel?> _legendPanels = new();
@@ -147,12 +124,8 @@ public ResourceMetricsContent()
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
             // Apply minimum column widths based on header text
-            TabHelpers.AutoSizeColumnMinWidths(DefaultTraceEventsDataGrid);
-            TabHelpers.AutoSizeColumnMinWidths(TraceAnalysisDataGrid);
 
             // Freeze identifier columns
-            TabHelpers.FreezeColumns(DefaultTraceEventsDataGrid, 1);
-            TabHelpers.FreezeColumns(TraceAnalysisDataGrid, 1);
         }
 
         private void SetupChartContextMenus()
@@ -230,14 +203,6 @@ public void SetTimeRange(int hoursBack, DateTime? fromDate = null, DateTime? toD
             _perfmonCountersFromDate = fromDate;
             _perfmonCountersToDate = toDate;
 
-            _defaultTraceEventsHoursBack = hoursBack;
-            _defaultTraceEventsFromDate = fromDate;
-            _defaultTraceEventsToDate = toDate;
-
-            _traceAnalysisHoursBack = hoursBack;
-            _traceAnalysisFromDate = fromDate;
-            _traceAnalysisToDate = toDate;
-
             _waitStatsDetailHoursBack = hoursBack;
             _waitStatsDetailFromDate = fromDate;
             _waitStatsDetailToDate = toDate;
@@ -262,8 +227,6 @@ await Task.WhenAll(
                     LoadFileIoLatencyChartsAsync(),
                     RefreshServerTrendsAsync(),
                     RefreshPerfmonCountersTabAsync(),
-                    RefreshDefaultTraceEventsAsync(),
-                    RefreshTraceAnalysisAsync(),
                     RefreshWaitStatsDetailTabAsync()
                 );
             }
@@ -1284,134 +1247,6 @@ private void LoadServerTrendsPerfmonChart(IEnumerable<PerfmonStatsItem> perfmonD
 
         #endregion
 
-        // Filtering logic moved to DataGridFilterService.ApplyFilter()
-
-
-        #region Shared Filter Popup Methods
-
-        private void ShowFilterPopup(Button button, string columnName, string dataGridName, 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
-                };
-            }
-
-            _currentFilterDataGridName = dataGridName;
-            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 (_currentFilterDataGridName)
-            {
-                case "DefaultTraceEvents":
-                    UpdateFilterState(_defaultTraceEventsFilters, e.FilterState);
-                    ApplyDefaultTraceEventsFilters();
-                    UpdateDataGridFilterButtonStyles(DefaultTraceEventsDataGrid, _defaultTraceEventsFilters);
-                    break;
-                case "TraceAnalysis":
-                    UpdateFilterState(_traceAnalysisFilters, e.FilterState);
-                    ApplyTraceAnalysisFilters();
-                    UpdateDataGridFilterButtonStyles(TraceAnalysisDataGrid, _traceAnalysisFilters);
-                    break;
-            }
-        }
-
-        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
-        {
-            if (_filterPopup != null) _filterPopup.IsOpen = false;
-        }
-
-        private void UpdateFilterState(Dictionary<string, ColumnFilterState> filters, ColumnFilterState filterState)
-        {
-            if (filterState.IsActive)
-                filters[filterState.ColumnName] = filterState;
-            else
-                filters.Remove(filterState.ColumnName);
-        }
-
-        private void UpdateDataGridFilterButtonStyles(DataGrid dataGrid, Dictionary<string, ColumnFilterState> filters)
-        {
-            foreach (var column in dataGrid.Columns)
-            {
-                if (column.Header is StackPanel headerPanel)
-                {
-                    var filterButton = headerPanel.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 System.Windows.Controls.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 Filter Click Handlers
-
-        private void DefaultTraceEventsFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button && button.Tag is string columnName)
-                ShowFilterPopup(button, columnName, "DefaultTraceEvents", _defaultTraceEventsFilters);
-        }
-
-        private void TraceAnalysisFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button && button.Tag is string columnName)
-                ShowFilterPopup(button, columnName, "TraceAnalysis", _traceAnalysisFilters);
-        }
-
-        #endregion
-
-        #region Apply Filter Methods
-
-        private void ApplyDefaultTraceEventsFilters()
-        {
-            if (_defaultTraceEventsUnfilteredData == null) { _defaultTraceEventsUnfilteredData = DefaultTraceEventsDataGrid.ItemsSource as List<DefaultTraceEventItem> ?? (DefaultTraceEventsDataGrid.ItemsSource as IEnumerable<DefaultTraceEventItem>)?.ToList(); }
-            if (_defaultTraceEventsUnfilteredData == null) return;
-            if (_defaultTraceEventsFilters.Count == 0) { DefaultTraceEventsDataGrid.ItemsSource = _defaultTraceEventsUnfilteredData; return; }
-            DefaultTraceEventsDataGrid.ItemsSource = _defaultTraceEventsUnfilteredData.Where(item => _defaultTraceEventsFilters.Values.All(f => !f.IsActive || DataGridFilterService.MatchesFilter(item, f))).ToList();
-        }
-
-        private void ApplyTraceAnalysisFilters()
-        {
-            if (_traceAnalysisUnfilteredData == null) { _traceAnalysisUnfilteredData = TraceAnalysisDataGrid.ItemsSource as List<TraceAnalysisItem> ?? (TraceAnalysisDataGrid.ItemsSource as IEnumerable<TraceAnalysisItem>)?.ToList(); }
-            if (_traceAnalysisUnfilteredData == null) return;
-            if (_traceAnalysisFilters.Count == 0) { TraceAnalysisDataGrid.ItemsSource = _traceAnalysisUnfilteredData; return; }
-            TraceAnalysisDataGrid.ItemsSource = _traceAnalysisUnfilteredData.Where(item => _traceAnalysisFilters.Values.All(f => !f.IsActive || DataGridFilterService.MatchesFilter(item, f))).ToList();
-        }
-
-        #endregion
-
         #region Context Menu Handlers
 
         private void CopyCell_Click(object sender, RoutedEventArgs e)
@@ -1787,105 +1622,6 @@ private void LoadPerfmonCountersChart(List<PerfmonStatsItem>? data, int hoursBac
 
         #endregion
 
-        #region Default Trace Events Tab
-
-        private string? _defaultTraceEventsFilter;
-
-        private void DefaultTraceEventsFilter_Changed(object sender, SelectionChangedEventArgs e)
-        {
-            if (DefaultTraceEventsFilterCombo.SelectedItem is ComboBoxItem selected)
-            {
-                _defaultTraceEventsFilter = selected.Tag?.ToString();
-                if (string.IsNullOrEmpty(_defaultTraceEventsFilter))
-                {
-                    _defaultTraceEventsFilter = null;
-                }
-                DefaultTraceEvents_Refresh_Click(sender, new RoutedEventArgs());
-            }
-        }
-
-        private async void DefaultTraceEvents_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                await RefreshDefaultTraceEventsAsync();
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error refreshing Default Trace Events data: {ex.Message}", ex);
-            }
-        }
-
-        private async Task RefreshDefaultTraceEventsAsync()
-        {
-            if (_databaseService == null) return;
-
-            try
-            {
-                var data = await _databaseService.GetDefaultTraceEventsAsync(_defaultTraceEventsHoursBack, _defaultTraceEventsFromDate, _defaultTraceEventsToDate, _defaultTraceEventsFilter);
-                DefaultTraceEventsDataGrid.ItemsSource = data;
-                DefaultTraceEventsNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading default trace events: {ex.Message}");
-            }
-        }
-
-        private void DefaultTraceEventsFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(DefaultTraceEventsDataGrid, sender as TextBox);
-        }
-
-        private void DefaultTraceEventsNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(DefaultTraceEventsDataGrid, sender as TextBox);
-        }
-
-        #endregion
-
-        #region Trace Analysis Tab
-
-        private async void TraceAnalysis_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                await RefreshTraceAnalysisAsync();
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error refreshing Trace Analysis data: {ex.Message}", ex);
-            }
-        }
-
-        private async Task RefreshTraceAnalysisAsync()
-        {
-            if (_databaseService == null) return;
-
-            try
-            {
-                var data = await _databaseService.GetTraceAnalysisAsync(_traceAnalysisHoursBack, _traceAnalysisFromDate, _traceAnalysisToDate);
-                TraceAnalysisDataGrid.ItemsSource = data;
-                TraceAnalysisNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading trace analysis: {ex.Message}");
-            }
-        }
-
-        private void TraceAnalysisFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(TraceAnalysisDataGrid, sender as TextBox);
-        }
-
-        private void TraceAnalysisNumericFilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            DataGridFilterService.ApplyFilter(TraceAnalysisDataGrid, sender as TextBox);
-        }
-
-        #endregion
-
         #region Wait Stats Detail Tab
 
         private void WaitTypesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -1923,8 +1659,8 @@ private void UpdateWaitTypeCount()
         {
             if (_waitTypeItems == null || WaitTypeCountText == null) return;
             int count = _waitTypeItems.Count(x => x.IsSelected);
-            WaitTypeCountText.Text = $"{count} / 20 selected";
-            WaitTypeCountText.Foreground = count >= 20
+            WaitTypeCountText.Text = $"{count} / 30 selected";
+            WaitTypeCountText.Foreground = count >= 30
                 ? new System.Windows.Media.SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#E57373")!)
                 : (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
         }
@@ -2018,6 +1754,19 @@ private async Task RefreshWaitStatsDetailTabAsync()
                     })
                     .ToList();
 
+                // Ensure poison waits are always in the picker even if they have no collected data
+                foreach (var poisonWait in TabHelpers.PoisonWaits)
+                {
+                    if (!waitTypes.Any(w => string.Equals(w.WaitType, poisonWait, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        waitTypes.Add(new WaitTypeSelectionItem
+                        {
+                            WaitType = poisonWait,
+                            IsSelected = previouslySelected.Contains(poisonWait)
+                        });
+                    }
+                }
+
                 // If nothing was previously selected, apply poison waits + usual suspects + top 10
                 if (!waitTypes.Any(w => w.IsSelected))
                 {
diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj
index 8de16fa1..4f568c24 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.2.0</Version>
+    <Version>1.3.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
diff --git a/Dashboard/Helpers/ChartHoverHelper.cs b/Dashboard/Helpers/ChartHoverHelper.cs
index 048e0c37..dd0e7122 100644
--- a/Dashboard/Helpers/ChartHoverHelper.cs
+++ b/Dashboard/Helpers/ChartHoverHelper.cs
@@ -11,6 +11,7 @@ namespace PerformanceMonitorDashboard.Helpers;
 /// <summary>
 /// Adds mouse-hover tooltips to a ScottPlot chart with multiple scatter series.
 /// Shows the series name, value, and timestamp in a popup that follows the mouse.
+/// Uses X-axis (time) proximity for reliable detection on time-series charts.
 /// </summary>
 internal sealed class ChartHoverHelper
 {
@@ -64,47 +65,60 @@ private void OnMouseMove(object sender, MouseEventArgs e)
     {
         if (_scatters.Count == 0) return;
         var now = DateTime.UtcNow;
-        if ((now - _lastUpdate).TotalMilliseconds < 50) return;
+        if ((now - _lastUpdate).TotalMilliseconds < 30) return;
         _lastUpdate = now;
 
-        var pos = e.GetPosition(_chart);
-        var pixel = new ScottPlot.Pixel(
-            (float)(pos.X * _chart.DisplayScale),
-            (float)(pos.Y * _chart.DisplayScale));
-        var mouseCoords = _chart.Plot.GetCoordinates(pixel);
+        try
+        {
+            var pos = e.GetPosition(_chart);
+            var pixel = new ScottPlot.Pixel(
+                (float)(pos.X * _chart.DisplayScale),
+                (float)(pos.Y * _chart.DisplayScale));
+            var mouseCoords = _chart.Plot.GetCoordinates(pixel);
 
-        double bestDistance = double.MaxValue;
-        ScottPlot.DataPoint bestPoint = default;
-        string bestLabel = "";
+            /* Use X-axis (time) proximity as the primary filter, Y-axis distance
+               as tiebreaker. This makes tooltips appear reliably when hovering at
+               any Y position near a data point's time — standard for time-series. */
+            double bestYDistance = double.MaxValue;
+            ScottPlot.DataPoint bestPoint = default;
+            string bestLabel = "";
+            bool found = false;
 
-        foreach (var (scatter, label) in _scatters)
-        {
-            var nearest = scatter.Data.GetNearest(mouseCoords, _chart.Plot.LastRender);
-            if (nearest.IsReal)
+            foreach (var (scatter, label) in _scatters)
             {
+                var nearest = scatter.Data.GetNearest(mouseCoords, _chart.Plot.LastRender);
+                if (!nearest.IsReal) continue;
+
                 var nearestPixel = _chart.Plot.GetPixel(
                     new ScottPlot.Coordinates(nearest.X, nearest.Y));
-                double dx = nearestPixel.X - pixel.X;
-                double dy = nearestPixel.Y - pixel.Y;
-                double dist = dx * dx + dy * dy;
-                if (dist < bestDistance)
+                double dx = Math.Abs(nearestPixel.X - pixel.X);
+                double dy = Math.Abs(nearestPixel.Y - pixel.Y);
+
+                /* Must be within 80px horizontally (time axis). Among matches,
+                   pick the series closest in Y (nearest line to cursor). */
+                if (dx < 80 && dy < bestYDistance)
                 {
-                    bestDistance = dist;
+                    bestYDistance = dy;
                     bestPoint = nearest;
                     bestLabel = label;
+                    found = true;
                 }
             }
-        }
 
-        if (bestPoint.IsReal && bestDistance < 2500) // ~50px radius
-        {
-            var time = DateTime.FromOADate(bestPoint.X);
-            _text.Text = $"{bestLabel}\n{bestPoint.Y:N1} {_unit}\n{time:HH:mm:ss}";
-            _popup.HorizontalOffset = pos.X + 15;
-            _popup.VerticalOffset = pos.Y + 15;
-            _popup.IsOpen = true;
+            if (found)
+            {
+                var time = DateTime.FromOADate(bestPoint.X);
+                _text.Text = $"{bestLabel}\n{bestPoint.Y:N1} {_unit}\n{time:HH:mm:ss}";
+                _popup.HorizontalOffset = pos.X + 15;
+                _popup.VerticalOffset = pos.Y + 15;
+                _popup.IsOpen = true;
+            }
+            else
+            {
+                _popup.IsOpen = false;
+            }
         }
-        else
+        catch
         {
             _popup.IsOpen = false;
         }
diff --git a/Dashboard/Helpers/NumericFilterHelper.cs b/Dashboard/Helpers/NumericFilterHelper.cs
index 77cefcce..a5f78a0e 100644
--- a/Dashboard/Helpers/NumericFilterHelper.cs
+++ b/Dashboard/Helpers/NumericFilterHelper.cs
@@ -23,14 +23,10 @@ public static bool MatchesFilter(object? value, string? filterText)
             if (!TryConvertToDecimal(value, out decimal numericValue))
                 return true; // If can't convert, don't filter out
 
-            // Check for range: "100-200" or "100..200"
-            if (filterText.Contains('-', StringComparison.Ordinal) && !filterText.StartsWith('-'))
+            // Check for range: "100-200", "-100-200", "-100--50", or "100..200"
+            if (TryParseRange(filterText, out decimal rangeMin, out decimal rangeMax))
             {
-                return EvaluateRange(numericValue, filterText);
-            }
-            else if (filterText.Contains("..", StringComparison.Ordinal))
-            {
-                return EvaluateRange(numericValue, filterText.Replace("..", "-", StringComparison.Ordinal));
+                return numericValue >= rangeMin && numericValue <= rangeMax;
             }
             // Check for >=
             else if (filterText.StartsWith(">=", StringComparison.Ordinal))
@@ -84,28 +80,33 @@ private static bool TryConvertToDecimal(object value, out decimal result)
             }
         }
 
-        private static bool EvaluateRange(decimal value, string rangeText)
+        private static bool TryParseRange(string text, out decimal min, out decimal max)
         {
-            var parts = rangeText.Split('-');
-            if (parts.Length == 2)
+            min = max = 0;
+
+            // Try ".." separator first (unambiguous)
+            int dotIdx = text.IndexOf("..", StringComparison.Ordinal);
+            if (dotIdx >= 0)
             {
-                if (decimal.TryParse(parts[0].Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out decimal min) &&
-                    decimal.TryParse(parts[1].Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out decimal max))
-                {
-                    return value >= min && value <= max;
-                }
+                return decimal.TryParse(text.Substring(0, dotIdx).Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out min) &&
+                       decimal.TryParse(text.Substring(dotIdx + 2).Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out max);
             }
-            // Handle negative numbers in range: e.g., "-100-200" means -100 to 200
-            else if (parts.Length == 3 && string.IsNullOrEmpty(parts[0]))
+
+            // For "-" separator, find the dash that separates two values (not a negative sign).
+            // A separator dash has a digit before it: "100-200", "-100-200", "-100--50"
+            for (int i = 1; i < text.Length; i++)
             {
-                if (decimal.TryParse("-" + parts[1].Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out decimal min) &&
-                    decimal.TryParse(parts[2].Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out decimal max))
+                if (text[i] == '-' && char.IsDigit(text[i - 1]))
                 {
-                    return value >= min && value <= max;
+                    if (decimal.TryParse(text.Substring(0, i).Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out min) &&
+                        decimal.TryParse(text.Substring(i + 1).Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out max))
+                    {
+                        return true;
+                    }
                 }
             }
 
-            return true; // Invalid range, don't filter
+            return false;
         }
     }
 }
diff --git a/Dashboard/Helpers/TabHelpers.cs b/Dashboard/Helpers/TabHelpers.cs
index a9cc90c9..0a671f07 100644
--- a/Dashboard/Helpers/TabHelpers.cs
+++ b/Dashboard/Helpers/TabHelpers.cs
@@ -28,6 +28,23 @@ namespace PerformanceMonitorDashboard.Helpers
     /// </summary>
     public static class TabHelpers
     {
+        /// <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.
+        /// </summary>
+        public static bool IsDoubleClickOnRow(DependencyObject originalSource)
+        {
+            var dep = originalSource;
+            while (dep != null)
+            {
+                if (dep is DataGridRow) return true;
+                if (dep is DataGridColumnHeader) return false;
+                dep = VisualTreeHelper.GetParent(dep);
+            }
+            return false;
+        }
+
         /// <summary>
         /// Material Design 300-level color palette for chart data series.
         /// Soft pastels optimized for dark backgrounds, ordered to map 1:1
@@ -87,7 +104,7 @@ public static class TabHelpers
 
         /// <summary>
         /// Returns the set of wait types that should be selected by default:
-        /// poison waits + usual suspects + top 10 by total wait time (deduped), capped at 20.
+        /// poison waits + usual suspects + top 10 by total wait time (deduped), capped at 30.
         /// The availableWaitTypes list must be sorted by total wait time descending.
         /// </summary>
         public static HashSet<string> GetDefaultWaitTypes(IList<string> availableWaitTypes)
@@ -108,11 +125,11 @@ public static HashSet<string> GetDefaultWaitTypes(IList<string> availableWaitTyp
                     if (w.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
                         defaults.Add(w);
 
-            // 4. Top 10 by total wait time (items not already in the set), hard cap at 20 total
+            // 4. Top 10 by total wait time (items not already in the set), hard cap at 30 total
             int added = 0;
             foreach (var w in availableWaitTypes)
             {
-                if (defaults.Count >= 20) break;
+                if (defaults.Count >= 30) break;
                 if (added >= 10) break;
                 if (defaults.Add(w))
                 {
diff --git a/Dashboard/MainWindow.xaml b/Dashboard/MainWindow.xaml
index f437f103..a99cca46 100644
--- a/Dashboard/MainWindow.xaml
+++ b/Dashboard/MainWindow.xaml
@@ -148,11 +148,31 @@
                             Height="32"
                             Margin="0,0,0,8"/>
                     <Button x:Name="AlertsHistoryButton"
-                            Content="Alerts"
                             Click="AlertsHistory_Click"
                             Style="{StaticResource AccentButton}"
                             Height="32"
-                            Margin="0,0,0,8"/>
+                            Margin="0,0,0,8">
+                        <Grid>
+                            <TextBlock Text="Alerts" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <Border x:Name="AlertBadge"
+                                    Background="#FF4444"
+                                    CornerRadius="8"
+                                    MinWidth="16" Height="16"
+                                    Padding="4,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Margin="0,-4,-8,0"
+                                    Visibility="Collapsed">
+                                <TextBlock x:Name="AlertBadgeText"
+                                           Text="0"
+                                           FontSize="10"
+                                           FontWeight="Bold"
+                                           Foreground="White"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"/>
+                            </Border>
+                        </Grid>
+                    </Button>
                     <Separator Margin="0,0,0,8"/>
                     <Button x:Name="RefreshAllButton"
                             Content="&#x21BB; Refresh All Status"
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 9640386e..3afcf7e6 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -145,6 +145,7 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             LoadSidebarState();
             ConfigureConnectionStatusTimer();
             ConfigureAlertCheckTimer();
+            UpdateAlertBadge();
             StartMcpServerIfEnabled();
 
             _displayRefreshTimer.Start();
@@ -233,7 +234,7 @@ private void MainWindow_Closing(object? sender, System.ComponentModel.CancelEven
                 try
                 {
                     _mcpCts?.Cancel();
-                    _mcpHostService.StopAsync(CancellationToken.None).Wait(TimeSpan.FromSeconds(5));
+                    Task.Run(() => _mcpHostService.StopAsync(CancellationToken.None)).Wait(TimeSpan.FromSeconds(5));
                 }
                 catch (Exception ex)
                 {
@@ -444,6 +445,12 @@ private void OpenServerTab(ServerConnection server)
             Helpers.ServerTimeHelper.UtcOffsetMinutes = utcOffset;
 
             var serverTab = new ServerTab(server, utcOffset);
+            serverTab.AlertAcknowledged += (_, _) =>
+            {
+                _emailAlertService.HideAllAlerts(8760, server.DisplayName);
+                UpdateAlertBadge();
+                _alertsHistoryContent?.RefreshAlerts();
+            };
 
             var headerPanel = new StackPanel { Orientation = Orientation.Horizontal };
             var headerText = new TextBlock
@@ -553,7 +560,7 @@ private void OpenNocTab()
             }
 
             // Create the landing page
-            _landingPage = new LandingPage();
+            _landingPage = new LandingPage(_serverManager);
             _landingPage.ServerCardClicked += LandingPage_ServerCardClicked;
 
             // Create tab header with close button
@@ -605,6 +612,7 @@ private void OpenAlertsTab()
             }
 
             _alertsHistoryContent = new AlertsHistoryContent();
+            _alertsHistoryContent.AlertsDismissed += (_, _) => UpdateAlertBadge();
 
             var headerPanel = new StackPanel { Orientation = Orientation.Horizontal };
             var headerText = new TextBlock
@@ -970,6 +978,24 @@ private async void AlertCheckTimer_Tick(object? sender, EventArgs e)
 
             /* Auto-refresh alert history if the tab is open */
             _alertsHistoryContent?.RefreshAlerts();
+
+            UpdateAlertBadge();
+        }
+
+        private void UpdateAlertBadge()
+        {
+            var alerts = _emailAlertService.GetAlertHistory(hoursBack: 24, limit: 100);
+            var count = alerts.Count;
+
+            if (count > 0)
+            {
+                AlertBadgeText.Text = count > 99 ? "99+" : count.ToString();
+                AlertBadge.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                AlertBadge.Visibility = Visibility.Collapsed;
+            }
         }
 
         /// <summary>
@@ -1549,6 +1575,15 @@ private void AcknowledgeServerAlerts_Click(object sender, RoutedEventArgs e)
                 {
                     serverTab.UpdateBadges(null, _alertStateService);
                 }
+
+                // Hide alerts in the email alert log so the sidebar badge updates
+                var server = _serverManager.GetAllServers().FirstOrDefault(s => s.Id == serverId);
+                if (server != null)
+                {
+                    _emailAlertService.HideAllAlerts(8760, server.DisplayName);
+                    UpdateAlertBadge();
+                    _alertsHistoryContent?.RefreshAlerts();
+                }
             }
         }
 
diff --git a/Dashboard/ManageServersWindow.xaml.cs b/Dashboard/ManageServersWindow.xaml.cs
index d6b81558..4ce1eaf1 100644
--- a/Dashboard/ManageServersWindow.xaml.cs
+++ b/Dashboard/ManageServersWindow.xaml.cs
@@ -34,6 +34,7 @@ private void LoadServers()
 
         private void ServersDataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
+            if (!Helpers.TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
             EditSelectedServer();
         }
 
diff --git a/Dashboard/Models/CurrentServerConfigItem.cs b/Dashboard/Models/CurrentServerConfigItem.cs
new file mode 100644
index 00000000..50ccc375
--- /dev/null
+++ b/Dashboard/Models/CurrentServerConfigItem.cs
@@ -0,0 +1,43 @@
+/*
+ * 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 CurrentServerConfigItem
+    {
+        public string ConfigurationName { get; set; } = string.Empty;
+        public string ValueConfigured { get; set; } = string.Empty;
+        public string ValueInUse { get; set; } = string.Empty;
+        public string ValueMinimum { get; set; } = string.Empty;
+        public string ValueMaximum { get; set; } = string.Empty;
+        public bool IsDynamic { get; set; }
+        public bool IsAdvanced { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public DateTime LastChanged { get; set; }
+    }
+
+    public class CurrentDatabaseConfigItem
+    {
+        public string DatabaseName { get; set; } = string.Empty;
+        public string SettingType { get; set; } = string.Empty;
+        public string SettingName { get; set; } = string.Empty;
+        public string SettingValue { get; set; } = string.Empty;
+        public DateTime LastChanged { get; set; }
+    }
+
+    public class CurrentTraceFlagItem
+    {
+        public int TraceFlag { get; set; }
+        public bool Status { get; set; }
+        public bool IsGlobal { get; set; }
+        public bool IsSession { get; set; }
+        public DateTime LastChanged { get; set; }
+    }
+}
diff --git a/Dashboard/Models/MemoryStatsItem.cs b/Dashboard/Models/MemoryStatsItem.cs
index 45d5bb96..92a26421 100644
--- a/Dashboard/Models/MemoryStatsItem.cs
+++ b/Dashboard/Models/MemoryStatsItem.cs
@@ -18,6 +18,10 @@ public class MemoryStatsItem
         public decimal AvailablePhysicalMemoryMb { get; set; }
         public int MemoryUtilizationPercentage { get; set; }
 
+        // Server and target memory
+        public decimal? TotalPhysicalMemoryMb { get; set; }
+        public decimal? CommittedTargetMemoryMb { get; set; }
+
         // Pressure warnings
         public bool BufferPoolPressureWarning { get; set; }
         public bool PlanCachePressureWarning { get; set; }
diff --git a/Dashboard/Models/ServerHealthStatus.cs b/Dashboard/Models/ServerHealthStatus.cs
index 4b4795c5..8094cd74 100644
--- a/Dashboard/Models/ServerHealthStatus.cs
+++ b/Dashboard/Models/ServerHealthStatus.cs
@@ -433,6 +433,8 @@ public HealthSeverity DeadlockSeverity
             get
             {
                 if (DeadlocksSinceLastCheck > 0) return HealthSeverity.Critical;
+                if (_lastDeadlockMinutesAgo.HasValue && _lastDeadlockMinutesAgo.Value <= 10) return HealthSeverity.Critical;
+                if (_lastDeadlockMinutesAgo.HasValue && _lastDeadlockMinutesAgo.Value <= 60) return HealthSeverity.Warning;
                 return HealthSeverity.Healthy;
             }
         }
@@ -447,6 +449,7 @@ public int? LastDeadlockMinutesAgo
                 _lastDeadlockMinutesAgo = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(DeadlockDetailText));
+                OnPropertyChanged(nameof(DeadlockSeverity));
             }
         }
 
diff --git a/Dashboard/ProcedureHistoryWindow.xaml b/Dashboard/ProcedureHistoryWindow.xaml
index 96d9ddc4..613b308b 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml
+++ b/Dashboard/ProcedureHistoryWindow.xaml
@@ -10,12 +10,29 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
+
+        <!-- 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="250"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="2*" MinHeight="250"/>
+            <RowDefinition Height="3*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
@@ -64,72 +81,331 @@
                   Foreground="{DynamicResource ForegroundBrush}"
                   RowBackground="{DynamicResource BackgroundBrush}"
                   GridLinesVisibility="All"
-                  RowHeight="30"
+                  RowHeight="35"
+                  ContextMenu="{DynamicResource DataGridContextMenu}"
                   Margin="10">
             <DataGrid.Columns>
                 <!-- Collection Info -->
-                <DataGridTextColumn Header="Collection Time" Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Last Execution" Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Cached Time" Binding="{Binding CachedTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Object Type" Binding="{Binding ObjectType}" Width="90"/>
-                <DataGridTextColumn Header="Type Desc" Binding="{Binding TypeDesc}" Width="120"/>
+                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Collection Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Last Execution" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding CachedTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CachedTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Cached Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding ObjectType}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ObjectType" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Object Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TypeDesc}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TypeDesc" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Type Desc" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Execution Count -->
-                <DataGridTextColumn Header="Exec Count" Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Exec Delta" Binding="{Binding ExecutionCountDelta, StringFormat=N0}" Width="85"/>
-
-                <!-- Worker Time (CPU) - Total/Avg/Min/Max -->
-                <DataGridTextColumn Header="Total CPU (ms)" Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" Width="110"/>
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Min CPU (ms)" Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Max CPU (ms)" Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="CPU Delta (ms)" Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" Width="105"/>
-
-                <!-- Elapsed Time - Total/Avg/Min/Max -->
-                <DataGridTextColumn Header="Total Duration (ms)" Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" Width="125"/>
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min Duration (ms)" Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Max Duration (ms)" Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Duration Delta (ms)" Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" Width="125"/>
+                <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" 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.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCountDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Exec Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+
+                <!-- Worker Time (CPU) -->
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" Width="110">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" Width="105">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="CPU Delta (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+
+                <!-- Elapsed Time -->
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Duration Delta (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Logical Reads -->
-                <DataGridTextColumn Header="Total Logical Reads" Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="125"/>
-                <DataGridTextColumn Header="Avg Logical Reads" Binding="{Binding AvgLogicalReads, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min Logical Reads" Binding="{Binding MinLogicalReads, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Max Logical Reads" Binding="{Binding MaxLogicalReads, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Reads Delta" Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" Width="95"/>
+                <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" Width="95">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Reads Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Physical Reads -->
-                <DataGridTextColumn Header="Total Physical Reads" Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="130"/>
-                <DataGridTextColumn Header="Avg Physical Reads" Binding="{Binding AvgPhysicalReads, StringFormat=N2}" Width="120"/>
-                <DataGridTextColumn Header="Min Physical Reads" Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120"/>
-                <DataGridTextColumn Header="Max Physical Reads" Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120"/>
-                <DataGridTextColumn Header="Phys Reads Delta" Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="130">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N2}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Phys Reads Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Logical Writes -->
-                <DataGridTextColumn Header="Total Logical Writes" Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="125"/>
-                <DataGridTextColumn Header="Avg Logical Writes" Binding="{Binding AvgLogicalWrites, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min Logical Writes" Binding="{Binding MinLogicalWrites, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Max Logical Writes" Binding="{Binding MaxLogicalWrites, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Writes Delta" Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" Width="95"/>
+                <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" Width="95">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWritesDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Writes Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Spills -->
-                <DataGridTextColumn Header="Total Spills" Binding="{Binding TotalSpills, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Avg Spills" Binding="{Binding AvgSpills, StringFormat=N2}" Width="85"/>
-                <DataGridTextColumn Header="Min Spills" Binding="{Binding MinSpills, StringFormat=N0}" Width="85"/>
-                <DataGridTextColumn Header="Max Spills" Binding="{Binding MaxSpills, StringFormat=N0}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgSpills, StringFormat=N2}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Sample Interval -->
-                <DataGridTextColumn Header="Interval (sec)" Binding="{Binding SampleIntervalSeconds}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding SampleIntervalSeconds}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SampleIntervalSeconds" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Interval (sec)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Download Plan Button -->
                 <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Button Content="Download" Click="DownloadPlan_Click"
-                                    IsEnabled="{Binding QueryPlanXml, Converter={StaticResource NullToBooleanConverter}}"
                                     HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Padding="8,4"/>
+                                    Padding="8,2"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
diff --git a/Dashboard/ProcedureHistoryWindow.xaml.cs b/Dashboard/ProcedureHistoryWindow.xaml.cs
index fe2d56b6..0a193ca8 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml.cs
+++ b/Dashboard/ProcedureHistoryWindow.xaml.cs
@@ -11,10 +11,13 @@
 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;
@@ -27,13 +30,25 @@ public partial class ProcedureHistoryWindow : Window
         private readonly string _databaseName;
         private readonly int _objectId;
         private readonly string _objectName;
+        private readonly int _hoursBack;
+        private readonly DateTime? _fromDate;
+        private readonly DateTime? _toDate;
         private List<ProcedureExecutionHistoryItem> _historyData = new();
 
+        // Filter state
+        private Dictionary<string, ColumnFilterState> _filters = new();
+        private List<ProcedureExecutionHistoryItem>? _unfilteredData;
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+
         public ProcedureHistoryWindow(
             DatabaseService databaseService,
             string databaseName,
             int objectId,
-            string objectName)
+            string objectName,
+            int hoursBack = 24,
+            DateTime? fromDate = null,
+            DateTime? toDate = null)
         {
             InitializeComponent();
 
@@ -41,6 +56,9 @@ public ProcedureHistoryWindow(
             _databaseName = databaseName;
             _objectId = objectId;
             _objectName = objectName;
+            _hoursBack = hoursBack;
+            _fromDate = fromDate;
+            _toDate = toDate;
 
             ProcedureIdentifierText.Text = $"Procedure Execution History: {objectName} in [{databaseName}]";
 
@@ -74,9 +92,12 @@ private async Task LoadHistoryAsync()
         {
             try
             {
-                _historyData = await _databaseService.GetProcedureStatsHistoryAsync(_databaseName, _objectId);
+                _historyData = await _databaseService.GetProcedureStatsHistoryAsync(_databaseName, _objectId, _hoursBack, _fromDate, _toDate);
 
+                _unfilteredData = _historyData;
+                _filters.Clear();
                 HistoryDataGrid.ItemsSource = _historyData;
+                UpdateFilterButtonStyles();
 
                 if (_historyData.Count > 0)
                 {
@@ -88,7 +109,7 @@ private async Task LoadHistoryAsync()
                     var lastSample = _historyData.Max(h => h.CollectionTime);
 
                     SummaryText.Text = string.Format(CultureInfo.CurrentCulture,
-                        "Samples: {0} | First: {1:yyyy-MM-dd HH:mm} | Last: {2:yyyy-MM-dd HH:mm} | Total Executions: {3:N0} | Avg CPU: {4:N2} ms | Avg Duration: {5:N2} ms",
+                        "Samples: {0} | First: {1:yyyy-MM-dd HH:mm} | Last: {2:yyyy-MM-dd HH:mm} | Executions: {3:N0} | Avg CPU: {4:N2} ms | Avg Duration: {5:N2} ms",
                         _historyData.Count, firstSample, lastSample, totalExecutions, avgCpu, avgDuration);
 
                     UpdateChart();
@@ -167,40 +188,240 @@ private void Close_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private void DownloadPlan_Click(object sender, RoutedEventArgs e)
+        private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         {
             if (sender is Button button && button.DataContext is ProcedureExecutionHistoryItem item)
             {
-                if (string.IsNullOrWhiteSpace(item.QueryPlanXml))
+                try
                 {
-                    MessageBox.Show("No query plan available for this collection.", "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
-                    return;
+                    button.IsEnabled = false;
+                    button.Content = "Loading...";
+
+                    var planXml = await _databaseService.GetProcedureStatsPlanXmlByCollectionIdAsync(item.CollectionId);
+
+                    if (string.IsNullOrWhiteSpace(planXml))
+                    {
+                        MessageBox.Show("No query plan available for this collection.", "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
+                        return;
+                    }
+
+                    var timestamp = item.CollectionTime.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
+                    var safeObjectName = string.Join("_", _objectName.Split(Path.GetInvalidFileNameChars()));
+                    var defaultFileName = $"procedure_history_{safeObjectName}_{timestamp}.sqlplan";
+
+                    var saveFileDialog = new SaveFileDialog
+                    {
+                        FileName = defaultFileName,
+                        Filter = "SQL Plan files (*.sqlplan)|*.sqlplan|XML files (*.xml)|*.xml|All files (*.*)|*.*",
+                        DefaultExt = ".sqlplan"
+                    };
+
+                    if (saveFileDialog.ShowDialog() == true)
+                    {
+                        File.WriteAllText(saveFileDialog.FileName, planXml);
+                        MessageBox.Show($"Query plan saved to:\n{saveFileDialog.FileName}", "Plan Saved", MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Failed to download query plan:\n{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                finally
+                {
+                    button.IsEnabled = true;
+                    button.Content = "Download Plan";
                 }
+            }
+        }
 
-                var timestamp = item.CollectionTime.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
-                var safeObjectName = string.Join("_", _objectName.Split(Path.GetInvalidFileNameChars()));
-                var defaultFileName = $"procedure_history_{safeObjectName}_{timestamp}.sqlplan";
+        #region Column Filter Popup
 
-                var saveFileDialog = new SaveFileDialog
+        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
                 {
-                    FileName = defaultFileName,
-                    Filter = "SQL Plan files (*.sqlplan)|*.sqlplan|XML files (*.xml)|*.xml|All files (*.*)|*.*",
-                    DefaultExt = ".sqlplan"
+                    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();
 
-                if (saveFileDialog.ShowDialog() == true)
+            HistoryDataGrid.ItemsSource = filtered;
+        }
+
+        private void UpdateFilterButtonStyles()
+        {
+            foreach (var column in HistoryDataGrid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
                 {
-                    try
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton?.Tag is string columnName)
                     {
-                        File.WriteAllText(saveFileDialog.FileName, item.QueryPlanXml);
-                        MessageBox.Show($"Query plan saved to:\n{saveFileDialog.FileName}", "Plan Saved", MessageBoxButton.OK, MessageBoxImage.Information);
+                        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";
                     }
-                    catch (Exception ex)
+                }
+            }
+        }
+
+        #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(TabHelpers.GetColumnHeader(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
                     {
-                        MessageBox.Show($"Failed to save query plan:\n{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                        FileName = $"procedure_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(TabHelpers.GetColumnHeader(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/QueryExecutionHistoryWindow.xaml b/Dashboard/QueryExecutionHistoryWindow.xaml
index e873f0a3..1a8bea6a 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml
@@ -10,12 +10,29 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
+
+        <!-- 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="250"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="2*" MinHeight="250"/>
+            <RowDefinition Height="3*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
@@ -66,74 +83,319 @@
                   Foreground="{DynamicResource ForegroundBrush}"
                   RowBackground="{DynamicResource BackgroundBrush}"
                   GridLinesVisibility="All"
-                  RowHeight="30"
+                  RowHeight="35"
+                  ContextMenu="{DynamicResource DataGridContextMenu}"
                   Margin="10">
             <DataGrid.Columns>
                 <!-- Collection Info -->
-                <DataGridTextColumn Header="Collection Time" Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Plan ID" Binding="{Binding PlanId}" Width="70"/>
-                <DataGridTextColumn Header="Executions" Binding="{Binding CountExecutions, StringFormat=N0}" Width="90"/>
+                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Collection Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding PlanId}" Width="70">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanId" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Plan ID" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding CountExecutions, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CountExecutions" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Executions" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Duration (ms) -->
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgDurationMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min Duration (ms)" Binding="{Binding MinDurationMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Max Duration (ms)" Binding="{Binding MaxDurationMs, StringFormat=N2}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding AvgDurationMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgDurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinDurationMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxDurationMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDurationMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- CPU (ms) -->
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Min CPU (ms)" Binding="{Binding MinCpuTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Max CPU (ms)" Binding="{Binding MaxCpuTimeMs, StringFormat=N2}" Width="100"/>
+                <DataGridTextColumn Binding="{Binding AvgCpuTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgCpuTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinCpuTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinCpuTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxCpuTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxCpuTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Logical Reads -->
-                <DataGridTextColumn Header="Avg Logical Reads" Binding="{Binding AvgLogicalReads, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Min Logical Reads" Binding="{Binding MinLogicalReads, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Max Logical Reads" Binding="{Binding MaxLogicalReads, StringFormat=N0}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinLogicalReads, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxLogicalReads, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Logical Writes -->
-                <DataGridTextColumn Header="Avg Logical Writes" Binding="{Binding AvgLogicalWrites, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Min Logical Writes" Binding="{Binding MinLogicalWrites, StringFormat=N0}" Width="115"/>
-                <DataGridTextColumn Header="Max Logical Writes" Binding="{Binding MaxLogicalWrites, StringFormat=N0}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinLogicalWrites, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxLogicalWrites, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Physical Reads -->
-                <DataGridTextColumn Header="Avg Physical Reads" Binding="{Binding AvgPhysicalReads, StringFormat=N0}" Width="120"/>
-                <DataGridTextColumn Header="Min Physical Reads" Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120"/>
-                <DataGridTextColumn Header="Max Physical Reads" Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120"/>
+                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- DOP -->
-                <DataGridTextColumn Header="Min DOP" Binding="{Binding MinDop}" Width="70"/>
-                <DataGridTextColumn Header="Max DOP" Binding="{Binding MaxDop}" Width="70"/>
+                <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="Filter_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.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max DOP" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Memory (MB) -->
-                <DataGridTextColumn Header="Avg Memory (MB)" Binding="{Binding AvgMemoryMb, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min Memory (MB)" Binding="{Binding MinMemoryMb, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Max Memory (MB)" Binding="{Binding MaxMemoryMb, StringFormat=N2}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding AvgMemoryMb, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgMemoryMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Memory (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinMemoryMb, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinMemoryMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Memory (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxMemoryMb, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxMemoryMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Memory (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Row Count -->
-                <DataGridTextColumn Header="Avg Rows" Binding="{Binding AvgRowcount, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Min Rows" Binding="{Binding MinRowcount, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Max Rows" Binding="{Binding MaxRowcount, StringFormat=N0}" Width="90"/>
+                <DataGridTextColumn Binding="{Binding AvgRowcount, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRowcount" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinRowcount, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRowcount" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxRowcount, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRowcount" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- TempDB (MB) -->
-                <DataGridTextColumn Header="Avg TempDB (MB)" Binding="{Binding AvgTempdbMb, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min TempDB (MB)" Binding="{Binding MinTempdbMb, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Max TempDB (MB)" Binding="{Binding MaxTempdbMb, StringFormat=N2}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding AvgTempdbMb, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgTempdbMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg TempDB (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinTempdbMb, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinTempdbMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min TempDB (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxTempdbMb, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxTempdbMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max TempDB (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Plan Info -->
-                <DataGridTextColumn Header="Plan Type" Binding="{Binding PlanType}" Width="100"/>
-                <DataGridCheckBoxColumn Header="Forced" Binding="{Binding IsForcedPlan}" Width="60"/>
-                <DataGridTextColumn Header="Force Failures" Binding="{Binding ForceFailureCount}" Width="100"/>
-                <DataGridTextColumn Header="Last Failure Reason" Binding="{Binding LastForceFailureReasonDesc}" Width="150"/>
-                <DataGridTextColumn Header="Forcing Type" Binding="{Binding PlanForcingType}" Width="100"/>
-                <DataGridTextColumn Header="Compat Level" Binding="{Binding CompatibilityLevel}" Width="90"/>
+                <DataGridTextColumn Binding="{Binding PlanType}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanType" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Plan Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridCheckBoxColumn Binding="{Binding IsForcedPlan}" Width="60">
+                    <DataGridCheckBoxColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="IsForcedPlan" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Forced" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridCheckBoxColumn.Header>
+                </DataGridCheckBoxColumn>
+                <DataGridTextColumn Binding="{Binding ForceFailureCount}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ForceFailureCount" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Force Failures" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding LastForceFailureReasonDesc}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastForceFailureReasonDesc" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Last Failure Reason" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding PlanForcingType}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanForcingType" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Forcing Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding CompatibilityLevel}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CompatibilityLevel" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Compat Level" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Download Plan Button -->
                 <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Button Content="Download" Click="DownloadPlan_Click"
-                                    IsEnabled="{Binding QueryPlanXml, Converter={StaticResource NullToBooleanConverter}}"
                                     HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Padding="8,4"/>
+                                    Padding="8,2"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
diff --git a/Dashboard/QueryExecutionHistoryWindow.xaml.cs b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
index 6e16fa72..b0479cc7 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml.cs
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
@@ -11,10 +11,13 @@
 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;
@@ -27,14 +30,26 @@ public partial class QueryExecutionHistoryWindow : Window
         private readonly string _databaseName;
         private readonly long _queryId;
         private readonly string _sourceType;
+        private readonly int _hoursBack;
+        private readonly DateTime? _fromDate;
+        private readonly DateTime? _toDate;
         private List<QueryExecutionHistoryItem> _historyData = new();
         private ScottPlot.IPanel? _legendPanel;
 
+        // Filter state
+        private Dictionary<string, ColumnFilterState> _filters = new();
+        private List<QueryExecutionHistoryItem>? _unfilteredData;
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+
         public QueryExecutionHistoryWindow(
             DatabaseService databaseService,
             string databaseName,
             long queryId,
-            string sourceType = "Query Store")
+            string sourceType = "Query Store",
+            int hoursBack = 24,
+            DateTime? fromDate = null,
+            DateTime? toDate = null)
         {
             InitializeComponent();
 
@@ -42,6 +57,9 @@ public QueryExecutionHistoryWindow(
             _databaseName = databaseName;
             _queryId = queryId;
             _sourceType = sourceType;
+            _hoursBack = hoursBack;
+            _fromDate = fromDate;
+            _toDate = toDate;
 
             QueryIdentifierText.Text = $"Query Execution History: Query {queryId} in [{databaseName}]";
 
@@ -51,7 +69,6 @@ public QueryExecutionHistoryWindow(
 
         private void ApplyDarkModeToChart()
         {
-            // Use TabHelpers pattern for consistency with other charts
             Helpers.TabHelpers.ApplyDarkModeToChart(HistoryChart);
         }
 
@@ -78,14 +95,17 @@ private async Task LoadHistoryAsync()
             {
                 if (_sourceType == "Query Store")
                 {
-                    _historyData = await _databaseService.GetQueryStoreHistoryAsync(_databaseName, _queryId);
+                    _historyData = await _databaseService.GetQueryStoreHistoryAsync(_databaseName, _queryId, _hoursBack, _fromDate, _toDate);
                 }
                 else
                 {
                     _historyData = new List<QueryExecutionHistoryItem>();
                 }
 
+                _unfilteredData = _historyData;
+                _filters.Clear();
                 HistoryDataGrid.ItemsSource = _historyData;
+                UpdateFilterButtonStyles();
 
                 if (_historyData.Count > 0)
                 {
@@ -221,39 +241,239 @@ private void Close_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private void DownloadPlan_Click(object sender, RoutedEventArgs e)
+        private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         {
             if (sender is Button button && button.DataContext is QueryExecutionHistoryItem item)
             {
-                if (string.IsNullOrWhiteSpace(item.QueryPlanXml))
+                try
                 {
-                    MessageBox.Show("No query plan available for this collection.", "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
-                    return;
+                    button.IsEnabled = false;
+                    button.Content = "Loading...";
+
+                    var planXml = await _databaseService.GetQueryStorePlanXmlByCollectionIdAsync(item.CollectionId);
+
+                    if (string.IsNullOrWhiteSpace(planXml))
+                    {
+                        MessageBox.Show("No query plan available for this collection.", "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
+                        return;
+                    }
+
+                    var timestamp = item.CollectionTime.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
+                    var defaultFileName = $"querystore_history_{_queryId}_{timestamp}.sqlplan";
+
+                    var saveFileDialog = new SaveFileDialog
+                    {
+                        FileName = defaultFileName,
+                        Filter = "SQL Plan files (*.sqlplan)|*.sqlplan|XML files (*.xml)|*.xml|All files (*.*)|*.*",
+                        DefaultExt = ".sqlplan"
+                    };
+
+                    if (saveFileDialog.ShowDialog() == true)
+                    {
+                        File.WriteAllText(saveFileDialog.FileName, planXml);
+                        MessageBox.Show($"Query plan saved to:\n{saveFileDialog.FileName}", "Plan Saved", MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Failed to download query plan:\n{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                finally
+                {
+                    button.IsEnabled = true;
+                    button.Content = "Download Plan";
                 }
+            }
+        }
 
-                var timestamp = item.CollectionTime.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
-                var defaultFileName = $"querystore_history_{_queryId}_{timestamp}.sqlplan";
+        #region Column Filter Popup
 
-                var saveFileDialog = new SaveFileDialog
+        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
                 {
-                    FileName = defaultFileName,
-                    Filter = "SQL Plan files (*.sqlplan)|*.sqlplan|XML files (*.xml)|*.xml|All files (*.*)|*.*",
-                    DefaultExt = ".sqlplan"
+                    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();
 
-                if (saveFileDialog.ShowDialog() == true)
+            HistoryDataGrid.ItemsSource = filtered;
+        }
+
+        private void UpdateFilterButtonStyles()
+        {
+            foreach (var column in HistoryDataGrid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
                 {
-                    try
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton?.Tag is string columnName)
                     {
-                        File.WriteAllText(saveFileDialog.FileName, item.QueryPlanXml);
-                        MessageBox.Show($"Query plan saved to:\n{saveFileDialog.FileName}", "Plan Saved", MessageBoxButton.OK, MessageBoxImage.Information);
+                        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";
                     }
-                    catch (Exception ex)
+                }
+            }
+        }
+
+        #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(TabHelpers.GetColumnHeader(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
                     {
-                        MessageBox.Show($"Failed to save query plan:\n{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                        FileName = $"query_execution_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(TabHelpers.GetColumnHeader(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/QueryStatsHistoryWindow.xaml b/Dashboard/QueryStatsHistoryWindow.xaml
index e5c60fe0..e76d826c 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml
+++ b/Dashboard/QueryStatsHistoryWindow.xaml
@@ -10,12 +10,29 @@
         Background="{DynamicResource BackgroundBrush}">
     <Window.Resources>
         <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
+
+        <!-- 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="250"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="2*" MinHeight="250"/>
+            <RowDefinition Height="3*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
@@ -64,88 +81,389 @@
                   Foreground="{DynamicResource ForegroundBrush}"
                   RowBackground="{DynamicResource BackgroundBrush}"
                   GridLinesVisibility="All"
-                  RowHeight="30"
+                  RowHeight="35"
+                  ContextMenu="{DynamicResource DataGridContextMenu}"
                   Margin="10">
             <DataGrid.Columns>
                 <!-- Collection Info -->
-                <DataGridTextColumn Header="Collection Time" Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Last Execution" Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Creation Time" Binding="{Binding CreationTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150"/>
-                <DataGridTextColumn Header="Object Type" Binding="{Binding ObjectType}" Width="90"/>
+                <DataGridTextColumn Binding="{Binding CollectionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollectionTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Collection Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding LastExecutionTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LastExecutionTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Last Execution" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding CreationTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CreationTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Creation Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding ObjectType}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ObjectType" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Object Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Execution Count -->
-                <DataGridTextColumn Header="Exec Count" Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Exec Delta" Binding="{Binding ExecutionCountDelta, StringFormat=N0}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding ExecutionCount, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCount" 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.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ExecutionCountDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Exec Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Worker Time (CPU) - Total/Avg/Min/Max -->
-                <DataGridTextColumn Header="Total CPU (ms)" Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" Width="110"/>
-                <DataGridTextColumn Header="Avg CPU (ms)" Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Min CPU (ms)" Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="Max CPU (ms)" Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" Width="100"/>
-                <DataGridTextColumn Header="CPU Delta (ms)" Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" Width="105"/>
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeMs, StringFormat=N2}" Width="110">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgWorkerTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinWorkerTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxWorkerTimeMs, StringFormat=N2}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxWorkerTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalWorkerTimeDeltaMs, StringFormat=N2}" Width="105">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalWorkerTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="CPU Delta (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Elapsed Time - Total/Avg/Min/Max -->
-                <DataGridTextColumn Header="Total Duration (ms)" Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" Width="125"/>
-                <DataGridTextColumn Header="Avg Duration (ms)" Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Min Duration (ms)" Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Max Duration (ms)" Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Duration Delta (ms)" Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" Width="125"/>
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeMs, StringFormat=N2}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgElapsedTimeMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinElapsedTimeMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxElapsedTimeMs, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedTimeMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalElapsedTimeDeltaMs, StringFormat=N2}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalElapsedTimeDeltaMs" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Duration Delta (ms)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Logical Reads -->
-                <DataGridTextColumn Header="Total Logical Reads" Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="125"/>
-                <DataGridTextColumn Header="Avg Logical Reads" Binding="{Binding AvgLogicalReads, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Reads Delta" Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" Width="95"/>
+                <DataGridTextColumn Binding="{Binding TotalLogicalReads, StringFormat=N0}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgLogicalReads, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Logical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalLogicalReadsDelta, StringFormat=N0}" Width="95">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Reads Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Physical Reads -->
-                <DataGridTextColumn Header="Total Physical Reads" Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="130"/>
-                <DataGridTextColumn Header="Avg Physical Reads" Binding="{Binding AvgPhysicalReads, StringFormat=N2}" Width="120"/>
-                <DataGridTextColumn Header="Min Physical Reads" Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120"/>
-                <DataGridTextColumn Header="Max Physical Reads" Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120"/>
-                <DataGridTextColumn Header="Phys Reads Delta" Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" Width="115"/>
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="130">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgPhysicalReads, StringFormat=N2}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxPhysicalReads, StringFormat=N0}" Width="120">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxPhysicalReads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalPhysicalReadsDelta, StringFormat=N0}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReadsDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Phys Reads Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Logical Writes -->
-                <DataGridTextColumn Header="Total Logical Writes" Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="125"/>
-                <DataGridTextColumn Header="Avg Logical Writes" Binding="{Binding AvgLogicalWrites, StringFormat=N2}" Width="115"/>
-                <DataGridTextColumn Header="Writes Delta" Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" Width="95"/>
+                <DataGridTextColumn Binding="{Binding TotalLogicalWrites, StringFormat=N0}" Width="125">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgLogicalWrites, StringFormat=N2}" Width="115">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgLogicalWrites" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Logical Writes" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding TotalLogicalWritesDelta, StringFormat=N0}" Width="95">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalLogicalWritesDelta" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Writes Delta" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Rows -->
-                <DataGridTextColumn Header="Total Rows" Binding="{Binding TotalRows, StringFormat=N0}" Width="100"/>
-                <DataGridTextColumn Header="Avg Rows" Binding="{Binding AvgRows, StringFormat=N2}" Width="90"/>
-                <DataGridTextColumn Header="Min Rows" Binding="{Binding MinRows, StringFormat=N0}" Width="85"/>
-                <DataGridTextColumn Header="Max Rows" Binding="{Binding MaxRows, StringFormat=N0}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding TotalRows, StringFormat=N0}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalRows" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding AvgRows, StringFormat=N2}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AvgRows" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Avg Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinRows, StringFormat=N0}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinRows" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxRows, StringFormat=N0}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxRows" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Rows" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Parallelism -->
-                <DataGridTextColumn Header="Min DOP" Binding="{Binding MinDop}" Width="70"/>
-                <DataGridTextColumn Header="Max DOP" Binding="{Binding MaxDop}" Width="70"/>
+                <DataGridTextColumn Binding="{Binding MinDop}" Width="70">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinDop" Click="Filter_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.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxDop" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max DOP" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Memory Grants -->
-                <DataGridTextColumn Header="Max Grant (MB)" Binding="{Binding MaxGrantMb, StringFormat=N2}" Width="105"/>
-                <DataGridTextColumn Header="Max Used (MB)" Binding="{Binding MaxUsedGrantMb, StringFormat=N2}" Width="105"/>
-                <DataGridTextColumn Header="Max Ideal (MB)" Binding="{Binding MaxIdealGrantMb, StringFormat=N2}" Width="105"/>
+                <DataGridTextColumn Binding="{Binding MaxGrantMb, StringFormat=N2}" Width="105">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxGrantMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Grant (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxUsedGrantMb, StringFormat=N2}" Width="105">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxUsedGrantMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Used (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxIdealGrantMb, StringFormat=N2}" Width="105">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxIdealGrantMb" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Ideal (MB)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Thread Usage -->
-                <DataGridTextColumn Header="Min Threads" Binding="{Binding MinUsedThreads}" Width="85"/>
-                <DataGridTextColumn Header="Max Threads" Binding="{Binding MaxUsedThreads}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding MinUsedThreads}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinUsedThreads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Threads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxUsedThreads}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxUsedThreads" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Threads" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Spills -->
-                <DataGridTextColumn Header="Total Spills" Binding="{Binding TotalSpills, StringFormat=N0}" Width="90"/>
-                <DataGridTextColumn Header="Min Spills" Binding="{Binding MinSpills, StringFormat=N0}" Width="85"/>
-                <DataGridTextColumn Header="Max Spills" Binding="{Binding MaxSpills, StringFormat=N0}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" Width="90">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MinSpills, StringFormat=N0}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Min Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
+                <DataGridTextColumn Binding="{Binding MaxSpills, StringFormat=N0}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxSpills" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Max Spills" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- CLR Time -->
-                <DataGridTextColumn Header="Total CLR Time" Binding="{Binding TotalClrTime, StringFormat=N0}" Width="100"/>
+                <DataGridTextColumn Binding="{Binding TotalClrTime, StringFormat=N0}" Width="100">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalClrTime" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Total CLR Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Sample Interval -->
-                <DataGridTextColumn Header="Interval (sec)" Binding="{Binding SampleIntervalSeconds}" Width="85"/>
+                <DataGridTextColumn Binding="{Binding SampleIntervalSeconds}" Width="85">
+                    <DataGridTextColumn.Header>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SampleIntervalSeconds" Click="Filter_Click" Margin="0,0,4,0"/>
+                            <TextBlock Text="Interval (sec)" FontWeight="Bold" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </DataGridTextColumn.Header>
+                </DataGridTextColumn>
 
                 <!-- Download Plan Button -->
                 <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Button Content="Download" Click="DownloadPlan_Click"
-                                    IsEnabled="{Binding QueryPlanXml, Converter={StaticResource NullToBooleanConverter}}"
                                     HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Padding="8,4"/>
+                                    Padding="8,2"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
diff --git a/Dashboard/QueryStatsHistoryWindow.xaml.cs b/Dashboard/QueryStatsHistoryWindow.xaml.cs
index 3e6108cf..8ce357ff 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml.cs
+++ b/Dashboard/QueryStatsHistoryWindow.xaml.cs
@@ -11,10 +11,13 @@
 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;
@@ -26,18 +29,33 @@ public partial class QueryStatsHistoryWindow : Window
         private readonly DatabaseService _databaseService;
         private readonly string _databaseName;
         private readonly string _queryHash;
+        private readonly int _hoursBack;
+        private readonly DateTime? _fromDate;
+        private readonly DateTime? _toDate;
         private List<QueryStatsHistoryItem> _historyData = new();
 
+        // Filter state
+        private Dictionary<string, ColumnFilterState> _filters = new();
+        private List<QueryStatsHistoryItem>? _unfilteredData;
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+
         public QueryStatsHistoryWindow(
             DatabaseService databaseService,
             string databaseName,
-            string queryHash)
+            string queryHash,
+            int hoursBack = 24,
+            DateTime? fromDate = null,
+            DateTime? toDate = null)
         {
             InitializeComponent();
 
             _databaseService = databaseService;
             _databaseName = databaseName;
             _queryHash = queryHash;
+            _hoursBack = hoursBack;
+            _fromDate = fromDate;
+            _toDate = toDate;
 
             QueryIdentifierText.Text = $"Query Stats History: {queryHash} in [{databaseName}]";
 
@@ -71,9 +89,12 @@ private async Task LoadHistoryAsync()
         {
             try
             {
-                _historyData = await _databaseService.GetQueryStatsHistoryAsync(_databaseName, _queryHash);
+                _historyData = await _databaseService.GetQueryStatsHistoryAsync(_databaseName, _queryHash, _hoursBack, _fromDate, _toDate);
 
+                _unfilteredData = _historyData;
+                _filters.Clear();
                 HistoryDataGrid.ItemsSource = _historyData;
+                UpdateFilterButtonStyles();
 
                 if (_historyData.Count > 0)
                 {
@@ -85,7 +106,7 @@ private async Task LoadHistoryAsync()
                     var lastSample = _historyData.Max(h => h.CollectionTime);
 
                     SummaryText.Text = string.Format(CultureInfo.CurrentCulture,
-                        "Samples: {0} | First: {1:yyyy-MM-dd HH:mm} | Last: {2:yyyy-MM-dd HH:mm} | Total Executions: {3:N0} | Avg CPU: {4:N2} ms | Avg Duration: {5:N2} ms",
+                        "Samples: {0} | First: {1:yyyy-MM-dd HH:mm} | Last: {2:yyyy-MM-dd HH:mm} | Executions: {3:N0} | Avg CPU: {4:N2} ms | Avg Duration: {5:N2} ms",
                         _historyData.Count, firstSample, lastSample, totalExecutions, avgCpu, avgDuration);
 
                     UpdateChart();
@@ -164,40 +185,240 @@ private void Close_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private void DownloadPlan_Click(object sender, RoutedEventArgs e)
+        private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         {
             if (sender is Button button && button.DataContext is QueryStatsHistoryItem item)
             {
-                if (string.IsNullOrWhiteSpace(item.QueryPlanXml))
+                try
                 {
-                    MessageBox.Show("No query plan available for this collection.", "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
-                    return;
+                    button.IsEnabled = false;
+                    button.Content = "Loading...";
+
+                    var planXml = await _databaseService.GetQueryStatsPlanXmlByCollectionIdAsync(item.CollectionId);
+
+                    if (string.IsNullOrWhiteSpace(planXml))
+                    {
+                        MessageBox.Show("No query plan available for this collection.", "No Plan", MessageBoxButton.OK, MessageBoxImage.Information);
+                        return;
+                    }
+
+                    var timestamp = item.CollectionTime.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
+                    var safeQueryHash = _queryHash.Replace("0x", "").Substring(0, Math.Min(8, _queryHash.Replace("0x", "").Length));
+                    var defaultFileName = $"query_stats_history_{safeQueryHash}_{timestamp}.sqlplan";
+
+                    var saveFileDialog = new SaveFileDialog
+                    {
+                        FileName = defaultFileName,
+                        Filter = "SQL Plan files (*.sqlplan)|*.sqlplan|XML files (*.xml)|*.xml|All files (*.*)|*.*",
+                        DefaultExt = ".sqlplan"
+                    };
+
+                    if (saveFileDialog.ShowDialog() == true)
+                    {
+                        File.WriteAllText(saveFileDialog.FileName, planXml);
+                        MessageBox.Show($"Query plan saved to:\n{saveFileDialog.FileName}", "Plan Saved", MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Failed to download query plan:\n{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                finally
+                {
+                    button.IsEnabled = true;
+                    button.Content = "Download Plan";
                 }
+            }
+        }
 
-                var timestamp = item.CollectionTime.ToString("yyyyMMdd_HHmmss", CultureInfo.InvariantCulture);
-                var safeQueryHash = _queryHash.Replace("0x", "").Substring(0, Math.Min(8, _queryHash.Replace("0x", "").Length));
-                var defaultFileName = $"query_stats_history_{safeQueryHash}_{timestamp}.sqlplan";
+        #region Column Filter Popup
 
-                var saveFileDialog = new SaveFileDialog
+        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
                 {
-                    FileName = defaultFileName,
-                    Filter = "SQL Plan files (*.sqlplan)|*.sqlplan|XML files (*.xml)|*.xml|All files (*.*)|*.*",
-                    DefaultExt = ".sqlplan"
+                    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();
 
-                if (saveFileDialog.ShowDialog() == true)
+            HistoryDataGrid.ItemsSource = filtered;
+        }
+
+        private void UpdateFilterButtonStyles()
+        {
+            foreach (var column in HistoryDataGrid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
                 {
-                    try
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton?.Tag is string columnName)
                     {
-                        File.WriteAllText(saveFileDialog.FileName, item.QueryPlanXml);
-                        MessageBox.Show($"Query plan saved to:\n{saveFileDialog.FileName}", "Plan Saved", MessageBoxButton.OK, MessageBoxImage.Information);
+                        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";
                     }
-                    catch (Exception ex)
+                }
+            }
+        }
+
+        #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(TabHelpers.GetColumnHeader(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
                     {
-                        MessageBox.Show($"Failed to save query plan:\n{ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                        FileName = $"query_stats_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(TabHelpers.GetColumnHeader(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/ServerTab.xaml b/Dashboard/ServerTab.xaml
index f98c1980..526137c9 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -224,6 +224,16 @@
                         <controls:CriticalIssuesContent x:Name="CriticalIssuesTab" />
                     </TabItem>
 
+                    <!-- Default Trace Sub-Tab -->
+                    <TabItem Header="Default Trace">
+                        <controls:DefaultTraceContent x:Name="DefaultTraceTab" />
+                    </TabItem>
+
+                    <!-- Current Configuration Sub-Tab -->
+                    <TabItem Header="Current Configuration">
+                        <controls:CurrentConfigContent x:Name="CurrentConfigTab" />
+                    </TabItem>
+
                     <!-- Server Configuration Changes Sub-Tab -->
                     <TabItem Header="Server Config Changes">
                         <Grid>
@@ -701,6 +711,84 @@
                     </StackPanel>
                 </TabItem.Header>
                 <TabControl>
+                    <!-- Blocking/Deadlock Stats Sub-Tab (default tab) -->
+                    <TabItem Header="Blocking/Deadlock Trends">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+
+                            <!-- Lock Wait Stats Chart - Full Width -->
+                            <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="Lock Wait Stats (LCK%)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                    <ScottPlot:WpfPlot Grid.Row="1" x:Name="LockWaitStatsChart"/>
+                                </Grid>
+                            </Border>
+
+                            <!-- Trend Charts - 2x2 Grid -->
+                            <Grid Grid.Row="1" Margin="5,2,5,5">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+
+                                <Border Grid.Row="0" Grid.Column="0" BorderBrush="LightGray" BorderThickness="1" Margin="2">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="Blocking Events" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsBlockingEventsChart"/>
+                                    </Grid>
+                                </Border>
+
+                                <Border Grid.Row="0" Grid.Column="1" BorderBrush="LightGray" BorderThickness="1" Margin="2">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="Blocking Duration (ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDurationChart"/>
+                                    </Grid>
+                                </Border>
+
+                                <Border Grid.Row="1" Grid.Column="0" BorderBrush="LightGray" BorderThickness="1" Margin="2">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="Deadlock Count" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDeadlocksChart"/>
+                                    </Grid>
+                                </Border>
+
+                                <Border Grid.Row="1" Grid.Column="1" BorderBrush="LightGray" BorderThickness="1" Margin="2">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="*"/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Grid.Row="0" Text="Deadlock Wait Time (ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
+                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDeadlockWaitTimeChart"/>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </Grid>
+                    </TabItem>
+
                     <!-- Blocking Sub-Tab -->
                     <TabItem Header="Blocking">
                         <Grid>
@@ -1085,83 +1173,6 @@
                         </Grid>
                     </TabItem>
 
-                    <!-- Blocking/Deadlock Stats Sub-Tab -->
-                    <TabItem Header="Blocking/Deadlock Trends">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-
-                            <!-- Lock Wait Stats Chart - Full Width -->
-                            <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="Lock Wait Stats (LCK%)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
-                                    <ScottPlot:WpfPlot Grid.Row="1" x:Name="LockWaitStatsChart"/>
-                                </Grid>
-                            </Border>
-
-                            <!-- Trend Charts - 2x2 Grid -->
-                            <Grid Grid.Row="1" Margin="5,2,5,5">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="*"/>
-                                </Grid.RowDefinitions>
-
-                                <Border Grid.Row="0" Grid.Column="0" BorderBrush="LightGray" BorderThickness="1" Margin="2">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                        </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Blocking Events" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
-                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsBlockingEventsChart"/>
-                                    </Grid>
-                                </Border>
-
-                                <Border Grid.Row="0" Grid.Column="1" BorderBrush="LightGray" BorderThickness="1" Margin="2">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                        </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Blocking Duration (ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
-                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDurationChart"/>
-                                    </Grid>
-                                </Border>
-
-                                <Border Grid.Row="1" Grid.Column="0" BorderBrush="LightGray" BorderThickness="1" Margin="2">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                        </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Deadlock Count" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
-                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDeadlocksChart"/>
-                                    </Grid>
-                                </Border>
-
-                                <Border Grid.Row="1" Grid.Column="1" BorderBrush="LightGray" BorderThickness="1" Margin="2">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                        </Grid.RowDefinitions>
-                                        <TextBlock Grid.Row="0" Text="Deadlock Wait Time (ms)" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,5"/>
-                                        <ScottPlot:WpfPlot Grid.Row="1" x:Name="BlockingStatsDeadlockWaitTimeChart"/>
-                                    </Grid>
-                                </Border>
-                            </Grid>
-                        </Grid>
-                    </TabItem>
                 </TabControl>
             </TabItem>
 
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 4259f3d1..5c849416 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -28,6 +28,12 @@ public partial class ServerTab : UserControl
         private readonly ICredentialService _credentialService;
         private ServerHealthStatus? _lastKnownStatus;
 
+        /// <summary>
+        /// Raised when the user acknowledges a sub-tab alert (Locking, Memory, etc.)
+        /// so the sidebar badge can be updated.
+        /// </summary>
+        public event EventHandler? AlertAcknowledged;
+
         /// <summary>
         /// This server's UTC offset in minutes, used to restore the global
         /// ServerTimeHelper when this tab becomes active.
@@ -114,6 +120,8 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             // Initialize Overview sub-tab UserControls
             DailySummaryTab.Initialize(_databaseService);
             CriticalIssuesTab.Initialize(_databaseService);
+            DefaultTraceTab.Initialize(_databaseService);
+            CurrentConfigTab.Initialize(_databaseService);
             MemoryTab.Initialize(_databaseService);
             PerformanceTab.Initialize(_databaseService, s => StatusText.Text = s);
             SystemEventsContent.Initialize(_databaseService);
@@ -699,7 +707,8 @@ private async void ServerTab_Loaded(object sender, RoutedEventArgs e)
                 ResourceMetricsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 SystemEventsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
-                
+                DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+
                 await LoadDataAsync();
             }
             catch (Exception ex)
@@ -862,6 +871,7 @@ private async void ApplyToAllTabs_Click(object sender, RoutedEventArgs e)
                 ResourceMetricsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 SystemEventsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                 CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+                DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
 
                 // Refresh all data
                 StatusText.Text = GetLoadingMessage();
@@ -1162,8 +1172,11 @@ private async Task ApplyAndRefreshCurrentTabAsync()
                         _resourceOverviewFromDate = _globalFromDate;
                         _resourceOverviewToDate = _globalToDate;
                         CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+                        DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         CollectionHealth_Refresh_Click(null, new RoutedEventArgs());
                         await CriticalIssuesTab.RefreshDataAsync();
+                        await DefaultTraceTab.RefreshAllDataAsync();
+                        await CurrentConfigTab.RefreshAllDataAsync();
                         await RefreshResourceOverviewAsync();
                         break;
 
@@ -1272,13 +1285,15 @@ private async Task LoadDataAsync()
                 var resourceMetricsTask = ResourceMetricsContent.RefreshAllDataAsync();
                 var dailySummaryTask = DailySummaryTab.RefreshDataAsync();
                 var criticalIssuesTask = CriticalIssuesTab.RefreshDataAsync();
+                var defaultTraceTask = DefaultTraceTab.RefreshAllDataAsync();
+                var currentConfigTask = CurrentConfigTab.RefreshAllDataAsync();
                 var systemEventsTask = SystemEventsContent.RefreshAllDataAsync();
 
                 // Wait for everything to complete before _isRefreshing resets
                 await Task.WhenAll(
                     healthTask, blockingEventsTask, deadlocksTask, blockingStatsTask, lockWaitStatsTask,
                     performanceTask, memoryTask, resourceOverviewTask, runningJobsTask,
-                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, systemEventsTask);
+                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, defaultTraceTask, currentConfigTask, systemEventsTask);
 
                 // Populate grids with fetched data
                 var healthData = await healthTask;
@@ -1347,6 +1362,7 @@ await Task.WhenAll(
 
         private void HealthDataGrid_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
+            if (!Helpers.TabHelpers.IsDoubleClickOnRow((DependencyObject)e.OriginalSource)) return;
             if (HealthDataGrid.SelectedItem is CollectionHealthItem item)
             {
                 var logWindow = new CollectionLogWindow(item.CollectorName, _databaseService);
@@ -3087,6 +3103,8 @@ private void AcknowledgeSubTabAlert_Click(object sender, RoutedEventArgs e)
                     {
                         badge.Visibility = Visibility.Collapsed;
                     }
+
+                    AlertAcknowledged?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
diff --git a/Dashboard/Services/DatabaseService.Memory.cs b/Dashboard/Services/DatabaseService.Memory.cs
index eb05205f..28a4d00e 100644
--- a/Dashboard/Services/DatabaseService.Memory.cs
+++ b/Dashboard/Services/DatabaseService.Memory.cs
@@ -46,7 +46,9 @@ public async Task<List<MemoryStatsItem>> GetMemoryStatsAsync(int hoursBack = 24,
             ms.available_physical_memory_mb,
             ms.memory_utilization_percentage,
             ms.buffer_pool_pressure_warning,
-            ms.plan_cache_pressure_warning
+            ms.plan_cache_pressure_warning,
+            ms.total_physical_memory_mb,
+            ms.committed_target_memory_mb
         FROM collect.memory_stats AS ms
         {dateFilter}
         ORDER BY
@@ -80,7 +82,9 @@ ORDER BY
                             AvailablePhysicalMemoryMb = reader.GetDecimal(7),
                             MemoryUtilizationPercentage = reader.GetInt32(8),
                             BufferPoolPressureWarning = reader.GetBoolean(9),
-                            PlanCachePressureWarning = reader.GetBoolean(10)
+                            PlanCachePressureWarning = reader.GetBoolean(10),
+                            TotalPhysicalMemoryMb = reader.IsDBNull(11) ? null : reader.GetDecimal(11),
+                            CommittedTargetMemoryMb = reader.IsDBNull(12) ? null : reader.GetDecimal(12)
                         });
                     }
         
diff --git a/Dashboard/Services/DatabaseService.NocHealth.cs b/Dashboard/Services/DatabaseService.NocHealth.cs
index 33a68263..c1f59887 100644
--- a/Dashboard/Services/DatabaseService.NocHealth.cs
+++ b/Dashboard/Services/DatabaseService.NocHealth.cs
@@ -505,7 +505,7 @@ private async Task GetLastBlockingEventTimeAsync(SqlConnection connection, Serve
 
                 SELECT TOP (1)
                     minutes_ago =
-                        DATEDIFF(MINUTE, bpx.event_time, SYSDATETIME())
+                        DATEDIFF(MINUTE, bpx.event_time, SYSUTCDATETIME())
                 FROM collect.blocked_process_xml AS bpx
                 ORDER BY
                     bpx.id DESC
@@ -530,7 +530,7 @@ private async Task GetLastDeadlockEventTimeAsync(SqlConnection connection, Serve
 
                 SELECT TOP (1)
                     minutes_ago =
-                        DATEDIFF(MINUTE, dx.event_time, SYSDATETIME())
+                        DATEDIFF(MINUTE, dx.event_time, SYSUTCDATETIME())
                 FROM collect.deadlock_xml AS dx
                 ORDER BY
                     dx.id DESC
@@ -623,6 +623,8 @@ CROSS APPLY sys.dm_exec_sql_text(r.sql_handle) AS t
                 JOIN sys.dm_exec_sessions AS s ON s.session_id = r.session_id
                 WHERE r.session_id > 50
                 AND r.total_elapsed_time >= @thresholdMs
+                AND t.text NOT LIKE N'%waitfor delay%'
+                AND t.text NOT LIKE N'%waitfor receive%'
                 ORDER BY r.total_elapsed_time DESC
                 OPTION(MAXDOP 1, RECOMPILE);";
 
diff --git a/Dashboard/Services/DatabaseService.QueryPerformance.cs b/Dashboard/Services/DatabaseService.QueryPerformance.cs
index 26cd0d17..60d2fc02 100644
--- a/Dashboard/Services/DatabaseService.QueryPerformance.cs
+++ b/Dashboard/Services/DatabaseService.QueryPerformance.cs
@@ -1248,51 +1248,66 @@ public async Task<List<LongRunningQueryPatternItem>> GetLongRunningQueryPatterns
                     await using var tc = await OpenThrottledConnectionAsync();
                     var connection = tc.Connection;
         
-                    string query;
-                    if (fromDate.HasValue && toDate.HasValue)
-                    {
-                        query = @"
+                    /* Inline the aggregation with time-bounded CTE instead of using the view.
+                       The view aggregates ALL time then takes TOP 50 by avg_duration, which causes
+                       the dashboard's time filter to find zero matches when recent patterns are
+                       shorter-running than old load test patterns (GitHub issue #168). */
+                    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())";
+
+                    string query = $@"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
-        SELECT
-            lrqp.database_name,
-            lrqp.query_pattern,
-            lrqp.executions,
-            lrqp.avg_duration_sec,
-            lrqp.max_duration_sec,
-            lrqp.avg_cpu_sec,
-            lrqp.avg_reads,
-            lrqp.avg_writes,
-            lrqp.concern_level,
-            lrqp.recommendation,
-            lrqp.sample_query_text,
-            lrqp.last_execution
-        FROM report.long_running_query_patterns AS lrqp
-        WHERE lrqp.last_execution >= @from_date AND lrqp.last_execution <= @to_date
-        ORDER BY lrqp.last_execution DESC;";
-                    }
-                    else
-                    {
-                        query = @"
-        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-
-        SELECT
-            lrqp.database_name,
-            lrqp.query_pattern,
-            lrqp.executions,
-            lrqp.avg_duration_sec,
-            lrqp.max_duration_sec,
-            lrqp.avg_cpu_sec,
-            lrqp.avg_reads,
-            lrqp.avg_writes,
-            lrqp.concern_level,
-            lrqp.recommendation,
-            lrqp.sample_query_text,
-            lrqp.last_execution
-        FROM report.long_running_query_patterns AS lrqp
-        WHERE lrqp.last_execution >= DATEADD(HOUR, @hours_back, SYSDATETIME())
-        ORDER BY lrqp.last_execution DESC;";
-                    }
+        WITH
+            query_patterns AS
+        (
+            SELECT
+                ta.database_name,
+                query_pattern = LEFT(ta.sql_text, 200),
+                executions = COUNT_BIG(*),
+                avg_duration_ms = AVG(ta.duration_ms),
+                max_duration_ms = MAX(ta.duration_ms),
+                avg_cpu_ms = AVG(ta.cpu_ms),
+                avg_reads = AVG(ta.reads),
+                avg_writes = AVG(ta.writes),
+                sample_query_text = MAX(ta.sql_text),
+                last_execution = MAX(ta.end_time)
+            FROM collect.trace_analysis AS ta
+            WHERE {timeFilter}
+            GROUP BY
+                ta.database_name,
+                LEFT(ta.sql_text, 200)
+        )
+        SELECT TOP (50)
+            database_name,
+            query_pattern,
+            executions,
+            avg_duration_sec = avg_duration_ms / 1000.0,
+            max_duration_sec = max_duration_ms / 1000.0,
+            avg_cpu_sec = avg_cpu_ms / 1000.0,
+            avg_reads,
+            avg_writes,
+            concern_level =
+                CASE
+                    WHEN avg_duration_ms > 60000 THEN N'CRITICAL - Avg > 1 minute'
+                    WHEN avg_duration_ms > 30000 THEN N'HIGH - Avg > 30 seconds'
+                    WHEN avg_duration_ms > 10000 THEN N'MEDIUM - Avg > 10 seconds'
+                    ELSE N'INFO'
+                END,
+            recommendation =
+                CASE
+                    WHEN avg_reads > 1000000 THEN N'High read count - check for missing indexes, table scans'
+                    WHEN avg_cpu_ms > avg_duration_ms * 0.8 THEN N'CPU-bound query - check for complex calculations, functions'
+                    WHEN avg_writes > 100000 THEN N'High write volume - review update/delete patterns'
+                    ELSE N'Review execution plan for optimization opportunities'
+                END,
+            sample_query_text = CONVERT(nvarchar(500), sample_query_text),
+            last_execution
+        FROM query_patterns
+        WHERE executions > 1
+        ORDER BY
+            avg_duration_ms DESC;";
         
                     using var command = new SqlCommand(query, connection);
                     command.CommandTimeout = 120;
@@ -1420,57 +1435,64 @@ FROM collect.blocking_deadlock_stats AS bds
                     return items;
                 }
 
-                public async Task<List<QueryExecutionHistoryItem>> GetQueryStoreHistoryAsync(string databaseName, long queryId)
+                public async Task<List<QueryExecutionHistoryItem>> GetQueryStoreHistoryAsync(string databaseName, long queryId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
                 {
                     var items = new List<QueryExecutionHistoryItem>();
 
                     await using var tc = await OpenThrottledConnectionAsync();
                     var connection = tc.Connection;
 
-                    string query = @"
+                    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())";
+
+                    string query = $@"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
         SELECT
-            qsd.collection_id,
+            collection_id = MAX(qsd.collection_id),
             qsd.collection_time,
             qsd.plan_id,
-            qsd.count_executions,
-            qsd.avg_duration,
-            qsd.min_duration,
-            qsd.max_duration,
-            qsd.avg_cpu_time,
-            qsd.min_cpu_time,
-            qsd.max_cpu_time,
-            qsd.avg_logical_io_reads,
-            qsd.min_logical_io_reads,
-            qsd.max_logical_io_reads,
-            qsd.avg_logical_io_writes,
-            qsd.min_logical_io_writes,
-            qsd.max_logical_io_writes,
-            qsd.avg_physical_io_reads,
-            qsd.min_physical_io_reads,
-            qsd.max_physical_io_reads,
-            qsd.min_dop,
-            qsd.max_dop,
-            qsd.avg_query_max_used_memory,
-            qsd.min_query_max_used_memory,
-            qsd.max_query_max_used_memory,
-            qsd.avg_rowcount,
-            qsd.min_rowcount,
-            qsd.max_rowcount,
-            qsd.avg_tempdb_space_used,
-            qsd.min_tempdb_space_used,
-            qsd.max_tempdb_space_used,
-            qsd.plan_type,
-            qsd.is_forced_plan,
-            qsd.force_failure_count,
-            qsd.last_force_failure_reason_desc,
-            qsd.plan_forcing_type,
-            qsd.compatibility_level,
-            qsd.query_plan_text
+            count_executions = SUM(qsd.count_executions),
+            avg_duration = SUM(qsd.avg_duration * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_duration = MIN(qsd.min_duration),
+            max_duration = MAX(qsd.max_duration),
+            avg_cpu_time = SUM(qsd.avg_cpu_time * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_cpu_time = MIN(qsd.min_cpu_time),
+            max_cpu_time = MAX(qsd.max_cpu_time),
+            avg_logical_io_reads = SUM(qsd.avg_logical_io_reads * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_logical_io_reads = MIN(qsd.min_logical_io_reads),
+            max_logical_io_reads = MAX(qsd.max_logical_io_reads),
+            avg_logical_io_writes = SUM(qsd.avg_logical_io_writes * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_logical_io_writes = MIN(qsd.min_logical_io_writes),
+            max_logical_io_writes = MAX(qsd.max_logical_io_writes),
+            avg_physical_io_reads = SUM(qsd.avg_physical_io_reads * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_physical_io_reads = MIN(qsd.min_physical_io_reads),
+            max_physical_io_reads = MAX(qsd.max_physical_io_reads),
+            min_dop = MIN(qsd.min_dop),
+            max_dop = MAX(qsd.max_dop),
+            avg_query_max_used_memory = SUM(qsd.avg_query_max_used_memory * qsd.count_executions) / NULLIF(SUM(qsd.count_executions), 0),
+            min_query_max_used_memory = MIN(qsd.min_query_max_used_memory),
+            max_query_max_used_memory = 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_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),
+            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),
+            last_force_failure_reason_desc = MAX(qsd.last_force_failure_reason_desc),
+            plan_forcing_type = MAX(qsd.plan_forcing_type),
+            compatibility_level = MAX(qsd.compatibility_level)
         FROM collect.query_store_data AS qsd
         WHERE qsd.database_name = @database_name
         AND   qsd.query_id = @query_id
+        {timeFilter}
+        GROUP BY
+            qsd.collection_time,
+            qsd.plan_id
         ORDER BY
             qsd.collection_time DESC;";
 
@@ -1480,6 +1502,16 @@ ORDER BY
                     command.Parameters.Add(new SqlParameter("@database_name", SqlDbType.NVarChar, 128) { Value = databaseName });
                     command.Parameters.Add(new SqlParameter("@query_id", SqlDbType.BigInt) { Value = queryId });
 
+                    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())
                     {
@@ -1520,22 +1552,25 @@ ORDER BY
                             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),
-                            QueryPlanXml = reader.IsDBNull(36) ? null : reader.GetString(36)
+                            CompatibilityLevel = reader.IsDBNull(35) ? null : reader.GetInt16(35)
                         });
                     }
 
                     return items;
                 }
 
-                public async Task<List<ProcedureExecutionHistoryItem>> GetProcedureStatsHistoryAsync(string databaseName, int objectId)
+                public async Task<List<ProcedureExecutionHistoryItem>> GetProcedureStatsHistoryAsync(string databaseName, int objectId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
                 {
                     var items = new List<ProcedureExecutionHistoryItem>();
 
                     await using var tc = await OpenThrottledConnectionAsync();
                     var connection = tc.Connection;
 
-                    string query = @"
+                    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
@@ -1571,11 +1606,11 @@ 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.query_plan
+            ps.sample_interval_seconds
         FROM collect.procedure_stats AS ps
         WHERE ps.database_name = @database_name
         AND   ps.object_id = @object_id
+        {timeFilter}
         ORDER BY
             ps.collection_time DESC;";
 
@@ -1585,6 +1620,16 @@ ORDER BY
                     command.Parameters.Add(new SqlParameter("@database_name", SqlDbType.NVarChar, 128) { Value = databaseName });
                     command.Parameters.Add(new SqlParameter("@object_id", SqlDbType.Int) { Value = objectId });
 
+                    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())
                     {
@@ -1622,73 +1667,78 @@ 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),
-                            QueryPlanXml = reader.IsDBNull(33) ? null : reader.GetString(33)
+                            SampleIntervalSeconds = reader.IsDBNull(32) ? null : reader.GetInt32(32)
                         });
                     }
 
                     return items;
                 }
 
-                public async Task<List<QueryStatsHistoryItem>> GetQueryStatsHistoryAsync(string databaseName, string queryHash)
+                public async Task<List<QueryStatsHistoryItem>> GetQueryStatsHistoryAsync(string databaseName, string queryHash, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
                 {
                     var items = new List<QueryStatsHistoryItem>();
 
                     await using var tc = await OpenThrottledConnectionAsync();
                     var connection = tc.Connection;
 
-                    string query = @"
+                    var timeFilter = fromDate.HasValue && toDate.HasValue
+                        ? "AND   qs.collection_time >= @from_date AND qs.collection_time <= @to_date"
+                        : "AND   qs.collection_time >= DATEADD(HOUR, -@hours_back, SYSDATETIME())";
+
+                    string query = $@"
         SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
         SELECT
-            qs.collection_id,
+            collection_id = MAX(qs.collection_id),
             qs.collection_time,
-            qs.server_start_time,
-            qs.object_type,
-            qs.creation_time,
-            qs.last_execution_time,
-            qs.execution_count,
-            qs.total_worker_time,
-            qs.min_worker_time,
-            qs.max_worker_time,
-            qs.total_elapsed_time,
-            qs.min_elapsed_time,
-            qs.max_elapsed_time,
-            qs.total_logical_reads,
-            qs.total_physical_reads,
-            qs.min_physical_reads,
-            qs.max_physical_reads,
-            qs.total_logical_writes,
-            qs.total_clr_time,
-            qs.total_rows,
-            qs.min_rows,
-            qs.max_rows,
-            qs.min_dop,
-            qs.max_dop,
-            qs.min_grant_kb,
-            qs.max_grant_kb,
-            qs.min_used_grant_kb,
-            qs.max_used_grant_kb,
-            qs.min_ideal_grant_kb,
-            qs.max_ideal_grant_kb,
-            qs.min_reserved_threads,
-            qs.max_reserved_threads,
-            qs.min_used_threads,
-            qs.max_used_threads,
-            qs.total_spills,
-            qs.min_spills,
-            qs.max_spills,
-            qs.execution_count_delta,
-            qs.total_worker_time_delta,
-            qs.total_elapsed_time_delta,
-            qs.total_logical_reads_delta,
-            qs.total_physical_reads_delta,
-            qs.total_logical_writes_delta,
-            qs.sample_interval_seconds,
-            qs.query_plan_text
+            server_start_time = MAX(qs.server_start_time),
+            object_type = MAX(qs.object_type),
+            creation_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_physical_reads = MAX(qs.total_physical_reads),
+            min_physical_reads = MIN(qs.min_physical_reads),
+            max_physical_reads = MAX(qs.max_physical_reads),
+            total_logical_writes = MAX(qs.total_logical_writes),
+            total_clr_time = MAX(qs.total_clr_time),
+            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),
+            min_used_grant_kb = MIN(qs.min_used_grant_kb),
+            max_used_grant_kb = MAX(qs.max_used_grant_kb),
+            min_ideal_grant_kb = MIN(qs.min_ideal_grant_kb),
+            max_ideal_grant_kb = MAX(qs.max_ideal_grant_kb),
+            min_reserved_threads = MIN(qs.min_reserved_threads),
+            max_reserved_threads = MAX(qs.max_reserved_threads),
+            min_used_threads = MIN(qs.min_used_threads),
+            max_used_threads = MAX(qs.max_used_threads),
+            total_spills = MAX(qs.total_spills),
+            min_spills = MIN(qs.min_spills),
+            max_spills = MAX(qs.max_spills),
+            execution_count_delta = SUM(qs.execution_count_delta),
+            total_worker_time_delta = SUM(qs.total_worker_time_delta),
+            total_elapsed_time_delta = SUM(qs.total_elapsed_time_delta),
+            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)
         FROM collect.query_stats AS qs
         WHERE qs.database_name = @database_name
         AND   qs.query_hash = CONVERT(binary(8), @query_hash, 1)
+        {timeFilter}
+        GROUP BY
+            qs.collection_time
         ORDER BY
             qs.collection_time DESC;";
 
@@ -1698,6 +1748,16 @@ ORDER BY
                     command.Parameters.Add(new SqlParameter("@database_name", SqlDbType.NVarChar, 128) { Value = databaseName });
                     command.Parameters.Add(new SqlParameter("@query_hash", SqlDbType.NVarChar, 20) { Value = queryHash });
 
+                    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())
                     {
@@ -1746,14 +1806,85 @@ 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),
-                            QueryPlanXml = reader.IsDBNull(44) ? null : reader.GetString(44)
+                            SampleIntervalSeconds = reader.IsDBNull(43) ? null : reader.GetInt32(43)
                         });
                     }
 
                     return items;
                 }
 
+        /// <summary>
+        /// Fetches query plan XML on demand for a single query_store_data row.
+        /// </summary>
+        public async Task<string?> GetQueryStorePlanXmlByCollectionIdAsync(long collectionId)
+        {
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query = @"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        SELECT
+            qsd.query_plan_text
+        FROM collect.query_store_data AS qsd
+        WHERE qsd.collection_id = @collection_id;";
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 120;
+            command.Parameters.Add(new SqlParameter("@collection_id", SqlDbType.BigInt) { Value = collectionId });
+
+            var result = await command.ExecuteScalarAsync();
+            return result == DBNull.Value || result == null ? null : (string)result;
+        }
+
+        /// <summary>
+        /// Fetches query plan XML on demand for a single procedure_stats row.
+        /// </summary>
+        public async Task<string?> GetProcedureStatsPlanXmlByCollectionIdAsync(long collectionId)
+        {
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query = @"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        SELECT
+            ps.query_plan
+        FROM collect.procedure_stats AS ps
+        WHERE ps.collection_id = @collection_id;";
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 120;
+            command.Parameters.Add(new SqlParameter("@collection_id", SqlDbType.BigInt) { Value = collectionId });
+
+            var result = await command.ExecuteScalarAsync();
+            return result == DBNull.Value || result == null ? null : (string)result;
+        }
+
+        /// <summary>
+        /// Fetches query plan XML on demand for a single query_stats row.
+        /// </summary>
+        public async Task<string?> GetQueryStatsPlanXmlByCollectionIdAsync(long collectionId)
+        {
+            await using var tc = await OpenThrottledConnectionAsync();
+            var connection = tc.Connection;
+
+            string query = @"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        SELECT
+            qs.query_plan_text
+        FROM collect.query_stats AS qs
+        WHERE qs.collection_id = @collection_id;";
+
+            using var command = new SqlCommand(query, connection);
+            command.CommandTimeout = 120;
+            command.Parameters.Add(new SqlParameter("@collection_id", SqlDbType.BigInt) { Value = collectionId });
+
+            var result = await command.ExecuteScalarAsync();
+            return result == DBNull.Value || result == null ? null : (string)result;
+        }
+
         /// <summary>
         /// Gets execution count trends from query stats deltas, aggregated by collection time.
         /// </summary>
diff --git a/Dashboard/Services/DatabaseService.SystemEvents.cs b/Dashboard/Services/DatabaseService.SystemEvents.cs
index 1e6b21ab..114dfe1b 100644
--- a/Dashboard/Services/DatabaseService.SystemEvents.cs
+++ b/Dashboard/Services/DatabaseService.SystemEvents.cs
@@ -1175,5 +1175,179 @@ FROM collect.HealthParser_MemoryNodeOOM AS hpmn
         
                     return items;
                 }
+
+                public async Task<List<CurrentServerConfigItem>> GetCurrentServerConfigAsync()
+                {
+                    var items = new List<CurrentServerConfigItem>();
+
+                    await using var tc = await OpenThrottledConnectionAsync();
+                    var connection = tc.Connection;
+
+                    string query = @"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        WITH
+            latest AS
+        (
+            SELECT
+                h.configuration_id,
+                h.configuration_name,
+                h.value_configured,
+                h.value_in_use,
+                h.value_minimum,
+                h.value_maximum,
+                h.is_dynamic,
+                h.is_advanced,
+                h.description,
+                h.collection_time,
+                rn = ROW_NUMBER() OVER (PARTITION BY h.configuration_id ORDER BY h.collection_time DESC)
+            FROM config.server_configuration_history AS h
+        )
+        SELECT
+            l.configuration_name,
+            value_configured = CONVERT(nvarchar(100), l.value_configured),
+            value_in_use = CONVERT(nvarchar(100), l.value_in_use),
+            value_minimum = CONVERT(nvarchar(100), l.value_minimum),
+            value_maximum = CONVERT(nvarchar(100), l.value_maximum),
+            l.is_dynamic,
+            l.is_advanced,
+            l.description,
+            last_changed = l.collection_time
+        FROM latest AS l
+        WHERE l.rn = 1
+        ORDER BY
+            l.configuration_name;";
+
+                    using var command = new SqlCommand(query, connection);
+                    command.CommandTimeout = 30;
+
+                    using var reader = await command.ExecuteReaderAsync();
+                    while (await reader.ReadAsync())
+                    {
+                        items.Add(new CurrentServerConfigItem
+                        {
+                            ConfigurationName = reader.GetString(0),
+                            ValueConfigured = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
+                            ValueInUse = reader.IsDBNull(2) ? string.Empty : reader.GetString(2),
+                            ValueMinimum = reader.IsDBNull(3) ? string.Empty : reader.GetString(3),
+                            ValueMaximum = reader.IsDBNull(4) ? string.Empty : reader.GetString(4),
+                            IsDynamic = reader.GetBoolean(5),
+                            IsAdvanced = reader.GetBoolean(6),
+                            Description = reader.IsDBNull(7) ? string.Empty : reader.GetString(7),
+                            LastChanged = reader.GetDateTime(8)
+                        });
+                    }
+
+                    return items;
+                }
+
+                public async Task<List<CurrentDatabaseConfigItem>> GetCurrentDatabaseConfigAsync()
+                {
+                    var items = new List<CurrentDatabaseConfigItem>();
+
+                    await using var tc = await OpenThrottledConnectionAsync();
+                    var connection = tc.Connection;
+
+                    string query = @"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        WITH
+            latest AS
+        (
+            SELECT
+                h.database_name,
+                h.setting_type,
+                h.setting_name,
+                h.setting_value,
+                h.collection_time,
+                rn = ROW_NUMBER() OVER (
+                    PARTITION BY h.database_name, h.setting_type, h.setting_name
+                    ORDER BY h.collection_time DESC
+                )
+            FROM config.database_configuration_history AS h
+        )
+        SELECT
+            l.database_name,
+            l.setting_type,
+            l.setting_name,
+            setting_value = CONVERT(nvarchar(500), l.setting_value),
+            last_changed = l.collection_time
+        FROM latest AS l
+        WHERE l.rn = 1
+        ORDER BY
+            l.database_name,
+            l.setting_type,
+            l.setting_name;";
+
+                    using var command = new SqlCommand(query, connection);
+                    command.CommandTimeout = 30;
+
+                    using var reader = await command.ExecuteReaderAsync();
+                    while (await reader.ReadAsync())
+                    {
+                        items.Add(new CurrentDatabaseConfigItem
+                        {
+                            DatabaseName = reader.GetString(0),
+                            SettingType = reader.GetString(1),
+                            SettingName = reader.GetString(2),
+                            SettingValue = reader.IsDBNull(3) ? string.Empty : reader.GetString(3),
+                            LastChanged = reader.GetDateTime(4)
+                        });
+                    }
+
+                    return items;
+                }
+
+                public async Task<List<CurrentTraceFlagItem>> GetCurrentTraceFlagsAsync()
+                {
+                    var items = new List<CurrentTraceFlagItem>();
+
+                    await using var tc = await OpenThrottledConnectionAsync();
+                    var connection = tc.Connection;
+
+                    string query = @"
+        SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+        WITH
+            latest AS
+        (
+            SELECT
+                h.trace_flag,
+                h.status,
+                h.is_global,
+                h.is_session,
+                h.collection_time,
+                rn = ROW_NUMBER() OVER (PARTITION BY h.trace_flag ORDER BY h.collection_time DESC)
+            FROM config.trace_flags_history AS h
+        )
+        SELECT
+            l.trace_flag,
+            l.status,
+            l.is_global,
+            l.is_session,
+            last_changed = l.collection_time
+        FROM latest AS l
+        WHERE l.rn = 1
+        ORDER BY
+            l.trace_flag;";
+
+                    using var command = new SqlCommand(query, connection);
+                    command.CommandTimeout = 30;
+
+                    using var reader = await command.ExecuteReaderAsync();
+                    while (await reader.ReadAsync())
+                    {
+                        items.Add(new CurrentTraceFlagItem
+                        {
+                            TraceFlag = reader.GetInt32(0),
+                            Status = reader.GetBoolean(1),
+                            IsGlobal = reader.GetBoolean(2),
+                            IsSession = reader.GetBoolean(3),
+                            LastChanged = reader.GetDateTime(4)
+                        });
+                    }
+
+                    return items;
+                }
     }
 }
diff --git a/Dashboard/SettingsWindow.xaml b/Dashboard/SettingsWindow.xaml
index 03ed9092..c7f21f33 100644
--- a/Dashboard/SettingsWindow.xaml
+++ b/Dashboard/SettingsWindow.xaml
@@ -58,9 +58,12 @@
                             <TextBlock Text="Show data from last:" VerticalAlignment="Center" Margin="0,0,10,0"/>
                             <ComboBox x:Name="DefaultTimeRangeComboBox" Width="120" SelectionChanged="DefaultTimeRangeComboBox_Changed">
                                 <ComboBoxItem Content="1 hour" Tag="1"/>
-                                <ComboBoxItem Content="6 hours" Tag="6"/>
+                                <ComboBoxItem Content="4 hours" Tag="4"/>
+                                <ComboBoxItem Content="8 hours" Tag="8"/>
+                                <ComboBoxItem Content="12 hours" Tag="12"/>
                                 <ComboBoxItem Content="24 hours" Tag="24"/>
                                 <ComboBoxItem Content="7 days" Tag="168"/>
+                                <ComboBoxItem Content="30 days" Tag="720"/>
                             </ComboBox>
                         </StackPanel>
 
diff --git a/Dashboard/SettingsWindow.xaml.cs b/Dashboard/SettingsWindow.xaml.cs
index c6d4de91..56bad3e0 100644
--- a/Dashboard/SettingsWindow.xaml.cs
+++ b/Dashboard/SettingsWindow.xaml.cs
@@ -83,7 +83,7 @@ private void LoadSettings()
             // Default to 24 hours if no match
             if (DefaultTimeRangeComboBox.SelectedItem == null)
             {
-                DefaultTimeRangeComboBox.SelectedIndex = 2; // 24 hours
+                DefaultTimeRangeComboBox.SelectedIndex = 4; // 24 hours
             }
 
             // Navigation settings
diff --git a/Installer/PerformanceMonitorInstaller.csproj b/Installer/PerformanceMonitorInstaller.csproj
index 07e9c964..a5091055 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.2.0</Version>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
-    <InformationalVersion>1.2.0</InformationalVersion>
+    <Version>1.3.0</Version>
+    <AssemblyVersion>1.3.0.0</AssemblyVersion>
+    <FileVersion>1.3.0.0</FileVersion>
+    <InformationalVersion>1.3.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/InstallerGui/InstallerGui.csproj b/InstallerGui/InstallerGui.csproj
index 2e41cf44..c9d3797a 100644
--- a/InstallerGui/InstallerGui.csproj
+++ b/InstallerGui/InstallerGui.csproj
@@ -8,7 +8,7 @@
     <AssemblyName>PerformanceMonitorInstallerGui</AssemblyName>
     <RootNamespace>PerformanceMonitorInstallerGui</RootNamespace>
     <Product>SQL Server Performance Monitor Installer</Product>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
diff --git a/Lite/App.xaml.cs b/Lite/App.xaml.cs
index 47d46db6..950855c7 100644
--- a/Lite/App.xaml.cs
+++ b/Lite/App.xaml.cs
@@ -20,6 +20,7 @@ public partial class App : Application
 {
     private const string MutexName = "PerformanceMonitorLite_SingleInstance";
     private Mutex? _singleInstanceMutex;
+    private bool _ownsMutex;
 
     /// <summary>
     /// Gets the application data directory where config and data files are stored.
@@ -119,9 +120,9 @@ protected override void OnStartup(StartupEventArgs e)
     {
 
         // Check for existing instance
-        _singleInstanceMutex = new Mutex(true, MutexName, out bool isNewInstance);
+        _singleInstanceMutex = new Mutex(true, MutexName, out _ownsMutex);
 
-        if (!isNewInstance)
+        if (!_ownsMutex)
         {
             MessageBox.Show(
                 "Performance Monitor Lite is already running.",
@@ -168,8 +169,10 @@ protected override void OnExit(ExitEventArgs e)
         AppLogger.Info("App", "Shutting down");
         AppLogger.Shutdown();
 
-        // Release the mutex
-        _singleInstanceMutex?.ReleaseMutex();
+        if (_ownsMutex)
+        {
+            _singleInstanceMutex?.ReleaseMutex();
+        }
         _singleInstanceMutex?.Dispose();
 
         base.OnExit(e);
diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index c99a7afe..41110533 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -127,7 +127,7 @@
                             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,4">
                                 <Button Content="Top Waits" Click="WaitTypeSelectAll_Click" Padding="6,2" Margin="0,0,4,0" FontSize="11"/>
                                 <Button Content="Clear All" Click="WaitTypeClearAll_Click" Padding="6,2" FontSize="11"/>
-                                <TextBlock x:Name="WaitTypeCountText" Text="0 / 20 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
+                                <TextBlock x:Name="WaitTypeCountText" Text="0 / 30 selected" FontSize="10" Foreground="{StaticResource ForegroundMutedBrush}" VerticalAlignment="Center" Margin="8,0,0,0"/>
                             </StackPanel>
                             <TextBox Grid.Row="2" x:Name="WaitTypeSearchBox" TextChanged="WaitTypeSearch_TextChanged"
                                      Margin="0,0,0,4" Padding="4,2"/>
@@ -911,21 +911,69 @@
                                     <DataGridTextColumn Binding="{Binding DatabaseName}" Width="200">
                                         <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 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.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">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CollationName" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Collation" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding RecoveryModel}" Width="120">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RecoveryModel" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Recovery Model" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding ReadOnlyDisplay}" Width="85">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ReadOnlyDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Read Only" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding RcsiDisplay}" Width="65">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="RcsiDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="RCSI" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding SnapshotIsolationState}" Width="130">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SnapshotIsolationState" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Snapshot Isolation" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AutoCreateStatsDisplay}" Width="110">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AutoCreateStatsDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Auto Create Stats" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AutoUpdateStatsDisplay}" Width="115">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AutoUpdateStatsDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Auto Update Stats" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AutoUpdateStatsAsyncDisplay}" Width="135">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AutoUpdateStatsAsyncDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Async Stats Update" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding ParameterizationForcedDisplay}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ParameterizationForcedDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Forced Parameterization" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding QueryStoreDisplay}" Width="95">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryStoreDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query Store" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding EncryptedDisplay}" Width="85">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="EncryptedDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Encrypted" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding TrustworthyDisplay}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TrustworthyDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Trustworthy" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding DbChainingDisplay}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DbChainingDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="DB Chaining" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding BrokerEnabledDisplay}" Width="95">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="BrokerEnabledDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Broker" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding CdcEnabledDisplay}" Width="70">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="CdcEnabledDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="CDC" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MixedPageAllocationDisplay}" Width="115">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MixedPageAllocationDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Mixed Pages" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding LogReuseWaitDesc}" Width="130">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="LogReuseWaitDesc" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Log Reuse Wait" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding AutoCloseDisplay}" Width="85">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AutoCloseDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Auto Close" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
                                     <DataGridTextColumn Binding="{Binding AutoShrinkDisplay}" Width="90">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AutoShrinkDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Auto Shrink" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding QueryStoreDisplay}" Width="95">
-                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="QueryStoreDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Query Store" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
                                     <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>
@@ -935,6 +983,15 @@
                                     <DataGridTextColumn Binding="{Binding DelayedDurability}" Width="130">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DelayedDurability" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Delayed Durability" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding AdrDisplay}" Width="65">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="AdrDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="ADR" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MemoryOptimizedDisplay}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MemoryOptimizedDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Memory Optimized" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding OptimizedLockingDisplay}" Width="125">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OptimizedLockingDisplay" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Optimized Locking" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
                                 </DataGrid.Columns>
                             </DataGrid>
                         </TabItem>
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index 28787580..a400e825 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -1119,7 +1119,7 @@ private static HashSet<string> GetDefaultWaitTypes(List<string> availableWaitTyp
         int added = 0;
         foreach (var w in availableWaitTypes)
         {
-            if (defaults.Count >= 20) break;
+            if (defaults.Count >= 30) break;
             if (added >= 10) break;
             if (defaults.Add(w)) { added++; }
         }
@@ -1156,8 +1156,8 @@ private void UpdateWaitTypeCount()
     {
         if (_waitTypeItems == null || WaitTypeCountText == null) return;
         int count = _waitTypeItems.Count(x => x.IsSelected);
-        WaitTypeCountText.Text = $"{count} / 20 selected";
-        WaitTypeCountText.Foreground = count >= 20
+        WaitTypeCountText.Text = $"{count} / 30 selected";
+        WaitTypeCountText.Foreground = count >= 30
             ? new SolidColorBrush((System.Windows.Media.Color)ColorConverter.ConvertFromString("#E57373")!)
             : (System.Windows.Media.Brush)FindResource("ForegroundMutedBrush");
     }
diff --git a/Lite/Database/DuckDbInitializer.cs b/Lite/Database/DuckDbInitializer.cs
index 13e7874b..6f912df8 100644
--- a/Lite/Database/DuckDbInitializer.cs
+++ b/Lite/Database/DuckDbInitializer.cs
@@ -19,18 +19,32 @@ public class DuckDbInitializer
     /// <summary>
     /// Current schema version. Increment this when schema changes require table rebuilds.
     /// </summary>
-    internal const int CurrentSchemaVersion = 10;
+    internal const int CurrentSchemaVersion = 11;
+
+    private readonly string _archivePath;
 
     public DuckDbInitializer(string databasePath, ILogger<DuckDbInitializer>? logger = null)
     {
         _databasePath = databasePath;
         _logger = logger;
+        _archivePath = Path.Combine(Path.GetDirectoryName(databasePath) ?? ".", "archive");
     }
 
+    /* Tables that have parquet archives — views are created to UNION hot data with archived parquet files */
+    private static readonly string[] ArchivableTables =
+    [
+        "wait_stats", "query_stats", "procedure_stats", "query_store_stats",
+        "query_snapshots", "cpu_utilization_stats", "file_io_stats", "memory_stats",
+        "memory_clerks", "tempdb_stats", "perfmon_stats", "deadlocks",
+        "blocked_process_reports", "collection_log"
+    ];
+
     /// <summary>
     /// Gets the connection string for the DuckDB database.
+    /// Disables automatic WAL checkpoints to prevent 2-3s stop-the-world stalls
+    /// during collector writes. Manual CHECKPOINT runs between collection cycles instead.
     /// </summary>
-    public string ConnectionString => $"Data Source={_databasePath}";
+    public string ConnectionString => $"Data Source={_databasePath};checkpoint_threshold=1GB";
 
     /// <summary>
     /// Ensures the database exists and all tables are created.
@@ -97,6 +111,8 @@ await ExecuteNonQueryAsync(connection,
 
             _logger?.LogInformation("Database initialization complete. Schema version: {Version}", CurrentSchemaVersion);
         }
+
+        await CreateArchiveViewsAsync();
     }
 
     /// <summary>
@@ -343,6 +359,15 @@ can be identified by server without needing a lookup table. */
                 /* Table doesn't exist yet — will be created with correct schema below */
             }
         }
+
+        if (fromVersion < 11)
+        {
+            /* v11: Expanded database_config from 9 to 28 columns (sys.databases).
+                    Added state_desc, collation, RCSI, snapshot isolation, stats settings,
+                    encryption, security, and version-gated columns (ADR, memory optimized, optimized locking). */
+            _logger?.LogInformation("Running migration to v11: rebuilding database_config for expanded sys.databases columns");
+            await ExecuteNonQueryAsync(connection, "DROP TABLE IF EXISTS database_config");
+        }
     }
 
     /// <summary>
@@ -408,6 +433,78 @@ public DuckDBConnection CreateConnection()
         return new DuckDBConnection(ConnectionString);
     }
 
+    /// <summary>
+    /// Creates or refreshes views that UNION hot DuckDB tables with archived parquet files.
+    /// Call at startup and after each archive cycle so newly archived data is queryable.
+    /// </summary>
+    public async Task CreateArchiveViewsAsync()
+    {
+        using var connection = CreateConnection();
+        await connection.OpenAsync();
+
+        foreach (var table in ArchivableTables)
+        {
+            try
+            {
+                var parquetGlob = Path.Combine(_archivePath, $"*_{table}.parquet");
+                var hasParquetFiles = Directory.Exists(_archivePath)
+                    && Directory.GetFiles(_archivePath, $"*_{table}.parquet").Length > 0;
+
+                string viewSql;
+                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)";
+                }
+                else
+                {
+                    viewSql = $"CREATE OR REPLACE VIEW v_{table} AS SELECT * FROM {table}";
+                }
+
+                using var cmd = connection.CreateCommand();
+                cmd.CommandText = viewSql;
+                await cmd.ExecuteNonQueryAsync();
+            }
+            catch (Exception ex)
+            {
+                /* Schema mismatch between hot table and old parquet — fall back to table-only view */
+                _logger?.LogWarning(ex, "Failed to create archive view for {Table}, using table-only view", table);
+                try
+                {
+                    using var fallbackCmd = connection.CreateCommand();
+                    fallbackCmd.CommandText = $"CREATE OR REPLACE VIEW v_{table} AS SELECT * FROM {table}";
+                    await fallbackCmd.ExecuteNonQueryAsync();
+                }
+                catch (Exception fallbackEx)
+                {
+                    _logger?.LogError(fallbackEx, "Failed to create fallback view for {Table}", table);
+                }
+            }
+        }
+
+        _logger?.LogDebug("Archive views created/refreshed for {Count} tables", ArchivableTables.Length);
+    }
+
+    /// <summary>
+    /// Runs a manual WAL checkpoint. Call this between collection cycles
+    /// to flush the WAL during idle time instead of during collector writes.
+    /// </summary>
+    public async Task CheckpointAsync()
+    {
+        try
+        {
+            using var connection = CreateConnection();
+            await connection.OpenAsync();
+            using var command = connection.CreateCommand();
+            command.CommandText = "CHECKPOINT";
+            await command.ExecuteNonQueryAsync();
+        }
+        catch (Exception ex)
+        {
+            _logger?.LogDebug(ex, "Manual checkpoint failed (non-critical)");
+        }
+    }
+
     /// <summary>
     /// Executes a non-query SQL statement.
     /// </summary>
@@ -448,4 +545,148 @@ public double GetDatabaseSizeMb()
         return fileInfo.Length / (1024.0 * 1024.0);
     }
 
+    /// <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.
+    /// </summary>
+    /// <returns>True if compaction was performed, false if skipped or failed.</returns>
+    public async Task<bool> CompactAsync()
+    {
+        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();
+                }
+
+                /* 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");
+            }
+
+            /* Clean up temp file */
+            if (File.Exists(tempPath)) File.Delete(tempPath);
+
+            return false;
+        }
+    }
+
 }
diff --git a/Lite/Database/Schema.cs b/Lite/Database/Schema.cs
index 24f46ab5..7b3961f5 100644
--- a/Lite/Database/Schema.cs
+++ b/Lite/Database/Schema.cs
@@ -385,14 +385,33 @@ CREATE TABLE IF NOT EXISTS database_config (
     server_id INTEGER NOT NULL,
     server_name VARCHAR NOT NULL,
     database_name VARCHAR NOT NULL,
+    state_desc VARCHAR,
     compatibility_level INTEGER,
+    collation_name VARCHAR,
     recovery_model VARCHAR,
+    is_read_only BOOLEAN,
     is_auto_close_on BOOLEAN,
     is_auto_shrink_on BOOLEAN,
+    is_auto_create_stats_on BOOLEAN,
+    is_auto_update_stats_on BOOLEAN,
+    is_auto_update_stats_async_on BOOLEAN,
+    is_read_committed_snapshot_on BOOLEAN,
+    snapshot_isolation_state VARCHAR,
+    is_parameterization_forced BOOLEAN,
     is_query_store_on BOOLEAN,
+    is_encrypted BOOLEAN,
+    is_trustworthy_on BOOLEAN,
+    is_db_chaining_on BOOLEAN,
+    is_broker_enabled BOOLEAN,
+    is_cdc_enabled BOOLEAN,
+    is_mixed_page_allocation_on BOOLEAN,
+    log_reuse_wait_desc VARCHAR,
     page_verify_option VARCHAR,
     target_recovery_time_seconds INTEGER,
-    delayed_durability VARCHAR
+    delayed_durability VARCHAR,
+    is_accelerated_database_recovery_on BOOLEAN,
+    is_memory_optimized_enabled BOOLEAN,
+    is_optimized_locking_on BOOLEAN
 )";
 
     // Index definitions
diff --git a/Lite/MainWindow.xaml.cs b/Lite/MainWindow.xaml.cs
index a29d0600..e1aed234 100644
--- a/Lite/MainWindow.xaml.cs
+++ b/Lite/MainWindow.xaml.cs
@@ -105,7 +105,7 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             var archiveService = new ArchiveService(_databaseInitializer, App.ArchiveDirectory);
             var retentionService = new RetentionService(App.ArchiveDirectory);
 
-            _backgroundService = new CollectionBackgroundService(_collectorService, archiveService, retentionService, _serverManager);
+            _backgroundService = new CollectionBackgroundService(_collectorService, _databaseInitializer, archiveService, retentionService, _serverManager);
 
             // Start background collection
             _backgroundCts = new CancellationTokenSource();
diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj
index 6b51c5fa..5bc6031c 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.2.0</Version>
+    <Version>1.3.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>
diff --git a/Lite/Services/ArchiveService.cs b/Lite/Services/ArchiveService.cs
index bfcf995b..5b71fac1 100644
--- a/Lite/Services/ArchiveService.cs
+++ b/Lite/Services/ArchiveService.cs
@@ -128,6 +128,9 @@ UNION ALL
                 _logger?.LogError(ex, "Failed to archive table {Table}", table);
             }
         }
+
+        /* Refresh archive views so newly archived parquet files are queryable */
+        await _duckDb.CreateArchiveViewsAsync();
         }
         finally
         {
diff --git a/Lite/Services/CollectionBackgroundService.cs b/Lite/Services/CollectionBackgroundService.cs
index dd15d340..1459c936 100644
--- a/Lite/Services/CollectionBackgroundService.cs
+++ b/Lite/Services/CollectionBackgroundService.cs
@@ -22,18 +22,26 @@ namespace PerformanceMonitorLite.Services;
 public class CollectionBackgroundService : BackgroundService
 {
     private readonly RemoteCollectorService _collectorService;
+    private readonly DuckDbInitializer? _duckDb;
     private readonly ServerManager? _serverManager;
     private readonly ArchiveService? _archiveService;
     private readonly RetentionService? _retentionService;
     private readonly ILogger<CollectionBackgroundService>? _logger;
 
     private static readonly TimeSpan CollectionInterval = TimeSpan.FromMinutes(1);
-    private DateTime _lastArchiveTime = DateTime.MinValue;
-    private DateTime _lastRetentionTime = DateTime.MinValue;
+    /* 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. */
+    private DateTime _lastArchiveTime = DateTime.UtcNow;
+    private DateTime _lastRetentionTime = DateTime.UtcNow;
+    private DateTime _lastCompactionTime = DateTime.UtcNow;
 
-    /* Archive every hour, retention cleanup once per day */
+    /* Archive every hour, retention + compaction 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;
 
     public bool IsPaused { get; set; }
     public DateTime? LastCollectionTime { get; private set; }
@@ -41,12 +49,14 @@ public class CollectionBackgroundService : BackgroundService
 
     public CollectionBackgroundService(
         RemoteCollectorService collectorService,
+        DuckDbInitializer? duckDb = null,
         ArchiveService? archiveService = null,
         RetentionService? retentionService = null,
         ServerManager? serverManager = null,
         ILogger<CollectionBackgroundService>? logger = null)
     {
         _collectorService = collectorService;
+        _duckDb = duckDb;
         _serverManager = serverManager;
         _archiveService = archiveService;
         _retentionService = retentionService;
@@ -104,6 +114,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                 /* Periodic retention cleanup */
                 RunRetentionIfDue();
+
+                /* Periodic database compaction to prevent bloat */
+                await RunCompactionIfDueAsync();
             }
 
             try
@@ -154,4 +167,37 @@ private void RunRetentionIfDue()
             _logger?.LogError(ex, "Retention cleanup failed");
         }
     }
+
+    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/LocalDataService.Blocking.cs b/Lite/Services/LocalDataService.Blocking.cs
index 11616d79..e82f781d 100644
--- a/Lite/Services/LocalDataService.Blocking.cs
+++ b/Lite/Services/LocalDataService.Blocking.cs
@@ -78,7 +78,7 @@ public async Task<List<DeadlockRow>> GetRecentDeadlocksAsync(int serverId, int h
     victim_process_id,
     victim_sql_text,
     deadlock_graph_xml
-FROM deadlocks
+FROM v_deadlocks
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -139,7 +139,7 @@ public async Task<List<QuerySnapshotRow>> GetLatestQuerySnapshotsAsync(int serve
     query_plan,
     live_query_plan,
     collection_time
-FROM query_snapshots
+FROM v_query_snapshots
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -230,7 +230,7 @@ public async Task<List<BlockedProcessReportRow>> GetRecentBlockedProcessReportsA
     blocking_last_batch_completed,
     blocked_priority,
     blocking_priority
-FROM blocked_process_reports
+FROM v_blocked_process_reports
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -310,7 +310,7 @@ Group by event_time (when blocking actually occurred) rather than collection_tim
     SELECT
         DATE_TRUNC('minute', event_time) AS bucket,
         COUNT(*) AS incident_count
-    FROM blocked_process_reports
+    FROM v_blocked_process_reports
     WHERE server_id = $1
     AND   event_time >= $2
     AND   event_time <= $3
@@ -353,7 +353,7 @@ public async Task<List<TrendPoint>> GetDeadlockTrendAsync(int serverId, int hour
     SELECT
         DATE_TRUNC('hour', deadlock_time) AS bucket,
         COUNT(*) AS deadlock_count
-    FROM deadlocks
+    FROM v_deadlocks
     WHERE server_id = $1
     AND   collection_time >= $2
     AND   collection_time <= $3
diff --git a/Lite/Services/LocalDataService.CollectionHealth.cs b/Lite/Services/LocalDataService.CollectionHealth.cs
index 226a3177..b93bfb76 100644
--- a/Lite/Services/LocalDataService.CollectionHealth.cs
+++ b/Lite/Services/LocalDataService.CollectionHealth.cs
@@ -34,7 +34,7 @@ public async Task<List<CollectorHealthRow>> GetCollectionHealthAsync(int serverI
     MAX(CASE WHEN status IN ('ERROR', 'PERMISSIONS') THEN error_message END) AS last_error,
     MAX(CASE WHEN status IN ('ERROR', 'PERMISSIONS') THEN collection_time END) AS last_error_time,
     SUM(CASE WHEN status = 'PERMISSIONS' THEN 1 ELSE 0 END) AS permission_denied_count
-FROM collection_log
+FROM v_collection_log
 WHERE server_id = $1
 AND   collection_time >= $2
 GROUP BY collector_name
@@ -83,7 +83,7 @@ public async Task<List<CollectionLogRow>> GetRecentCollectionLogAsync(int server
     status,
     error_message,
     server_name
-FROM collection_log
+FROM v_collection_log
 WHERE server_id = $1
 AND   collection_time >= $2
 ORDER BY collection_time DESC
diff --git a/Lite/Services/LocalDataService.Config.cs b/Lite/Services/LocalDataService.Config.cs
index f3983ba7..82b9e9ee 100644
--- a/Lite/Services/LocalDataService.Config.cs
+++ b/Lite/Services/LocalDataService.Config.cs
@@ -56,9 +56,14 @@ public async Task<List<DatabaseConfigRow>> GetLatestDatabaseConfigAsync(int serv
         using var connection = await OpenConnectionAsync();
         using var command = connection.CreateCommand();
         command.CommandText = @"
-SELECT database_name, compatibility_level, recovery_model,
-       is_auto_close_on, is_auto_shrink_on, is_query_store_on,
-       page_verify_option, target_recovery_time_seconds, delayed_durability
+SELECT database_name, state_desc, compatibility_level, collation_name, recovery_model,
+       is_read_only, is_auto_close_on, is_auto_shrink_on,
+       is_auto_create_stats_on, is_auto_update_stats_on, is_auto_update_stats_async_on,
+       is_read_committed_snapshot_on, snapshot_isolation_state, is_parameterization_forced,
+       is_query_store_on, is_encrypted, is_trustworthy_on, is_db_chaining_on,
+       is_broker_enabled, is_cdc_enabled, is_mixed_page_allocation_on,
+       log_reuse_wait_desc, page_verify_option, target_recovery_time_seconds, delayed_durability,
+       is_accelerated_database_recovery_on, is_memory_optimized_enabled, is_optimized_locking_on
 FROM database_config
 WHERE server_id = $1
 AND   capture_time = (SELECT MAX(capture_time) FROM database_config WHERE server_id = $1)
@@ -70,17 +75,37 @@ FROM database_config
         using var reader = await command.ExecuteReaderAsync();
         while (await reader.ReadAsync())
         {
+            var ordinal = 0;
             items.Add(new DatabaseConfigRow
             {
-                DatabaseName = reader.GetString(0),
-                CompatibilityLevel = reader.IsDBNull(1) ? 0 : reader.GetInt32(1),
-                RecoveryModel = reader.IsDBNull(2) ? "" : reader.GetString(2),
-                IsAutoCloseOn = !reader.IsDBNull(3) && reader.GetBoolean(3),
-                IsAutoShrinkOn = !reader.IsDBNull(4) && reader.GetBoolean(4),
-                IsQueryStoreOn = !reader.IsDBNull(5) && reader.GetBoolean(5),
-                PageVerifyOption = reader.IsDBNull(6) ? "" : reader.GetString(6),
-                TargetRecoveryTimeSeconds = reader.IsDBNull(7) ? 0 : reader.GetInt32(7),
-                DelayedDurability = reader.IsDBNull(8) ? "" : reader.GetString(8)
+                DatabaseName = reader.GetString(ordinal++),
+                StateDesc = reader.IsDBNull(ordinal) ? "" : reader.GetString(ordinal),
+                CompatibilityLevel = reader.IsDBNull(++ordinal) ? 0 : reader.GetInt32(ordinal),
+                CollationName = reader.IsDBNull(++ordinal) ? "" : reader.GetString(ordinal),
+                RecoveryModel = reader.IsDBNull(++ordinal) ? "" : reader.GetString(ordinal),
+                IsReadOnly = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsAutoCloseOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsAutoShrinkOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsAutoCreateStatsOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsAutoUpdateStatsOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsAutoUpdateStatsAsyncOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsRcsiOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                SnapshotIsolationState = reader.IsDBNull(++ordinal) ? "" : reader.GetString(ordinal),
+                IsParameterizationForced = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsQueryStoreOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsEncrypted = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsTrustworthyOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsDbChainingOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsBrokerEnabled = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsCdcEnabled = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsMixedPageAllocationOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                LogReuseWaitDesc = reader.IsDBNull(++ordinal) ? "" : reader.GetString(ordinal),
+                PageVerifyOption = reader.IsDBNull(++ordinal) ? "" : reader.GetString(ordinal),
+                TargetRecoveryTimeSeconds = reader.IsDBNull(++ordinal) ? 0 : reader.GetInt32(ordinal),
+                DelayedDurability = reader.IsDBNull(++ordinal) ? "" : reader.GetString(ordinal),
+                IsAcceleratedDatabaseRecoveryOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsMemoryOptimizedEnabled = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                IsOptimizedLockingOn = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
             });
         }
 
@@ -167,17 +192,53 @@ public class ServerConfigRow
 public class DatabaseConfigRow
 {
     public string DatabaseName { get; set; } = "";
+    public string StateDesc { get; set; } = "";
     public int CompatibilityLevel { get; set; }
+    public string CollationName { get; set; } = "";
     public string RecoveryModel { get; set; } = "";
+    public bool IsReadOnly { get; set; }
     public bool IsAutoCloseOn { get; set; }
     public bool IsAutoShrinkOn { get; set; }
+    public bool IsAutoCreateStatsOn { get; set; }
+    public bool IsAutoUpdateStatsOn { get; set; }
+    public bool IsAutoUpdateStatsAsyncOn { get; set; }
+    public bool IsRcsiOn { get; set; }
+    public string SnapshotIsolationState { get; set; } = "";
+    public bool IsParameterizationForced { get; set; }
     public bool IsQueryStoreOn { get; set; }
+    public bool IsEncrypted { get; set; }
+    public bool IsTrustworthyOn { get; set; }
+    public bool IsDbChainingOn { get; set; }
+    public bool IsBrokerEnabled { get; set; }
+    public bool IsCdcEnabled { get; set; }
+    public bool IsMixedPageAllocationOn { get; set; }
+    public string LogReuseWaitDesc { get; set; } = "";
     public string PageVerifyOption { get; set; } = "";
     public int TargetRecoveryTimeSeconds { get; set; }
     public string DelayedDurability { get; set; } = "";
+    public bool IsAcceleratedDatabaseRecoveryOn { get; set; }
+    public bool IsMemoryOptimizedEnabled { get; set; }
+    public bool IsOptimizedLockingOn { get; set; }
+
+    /* Display properties for DataGrid (bool → Yes/No) */
+    public string ReadOnlyDisplay => IsReadOnly ? "Yes" : "No";
     public string AutoCloseDisplay => IsAutoCloseOn ? "Yes" : "No";
     public string AutoShrinkDisplay => IsAutoShrinkOn ? "Yes" : "No";
+    public string AutoCreateStatsDisplay => IsAutoCreateStatsOn ? "Yes" : "No";
+    public string AutoUpdateStatsDisplay => IsAutoUpdateStatsOn ? "Yes" : "No";
+    public string AutoUpdateStatsAsyncDisplay => IsAutoUpdateStatsAsyncOn ? "Yes" : "No";
+    public string RcsiDisplay => IsRcsiOn ? "Yes" : "No";
+    public string ParameterizationForcedDisplay => IsParameterizationForced ? "Yes" : "No";
     public string QueryStoreDisplay => IsQueryStoreOn ? "Yes" : "No";
+    public string EncryptedDisplay => IsEncrypted ? "Yes" : "No";
+    public string TrustworthyDisplay => IsTrustworthyOn ? "Yes" : "No";
+    public string DbChainingDisplay => IsDbChainingOn ? "Yes" : "No";
+    public string BrokerEnabledDisplay => IsBrokerEnabled ? "Yes" : "No";
+    public string CdcEnabledDisplay => IsCdcEnabled ? "Yes" : "No";
+    public string MixedPageAllocationDisplay => IsMixedPageAllocationOn ? "Yes" : "No";
+    public string AdrDisplay => IsAcceleratedDatabaseRecoveryOn ? "Yes" : "No";
+    public string MemoryOptimizedDisplay => IsMemoryOptimizedEnabled ? "Yes" : "No";
+    public string OptimizedLockingDisplay => IsOptimizedLockingOn ? "Yes" : "No";
 }
 
 public class DatabaseScopedConfigRow
diff --git a/Lite/Services/LocalDataService.Cpu.cs b/Lite/Services/LocalDataService.Cpu.cs
index e9d6aa61..50e7be8a 100644
--- a/Lite/Services/LocalDataService.Cpu.cs
+++ b/Lite/Services/LocalDataService.Cpu.cs
@@ -32,7 +32,7 @@ public async Task<List<CpuUtilizationRow>> GetCpuUtilizationAsync(int serverId,
     sample_time,
     sqlserver_cpu_utilization,
     other_process_cpu_utilization
-FROM cpu_utilization_stats
+FROM v_cpu_utilization_stats
 WHERE server_id = $1
 AND   sample_time >= $2
 AND   sample_time <= $3
diff --git a/Lite/Services/LocalDataService.FileIo.cs b/Lite/Services/LocalDataService.FileIo.cs
index 47185c91..3b1dfbe0 100644
--- a/Lite/Services/LocalDataService.FileIo.cs
+++ b/Lite/Services/LocalDataService.FileIo.cs
@@ -35,9 +35,9 @@ public async Task<List<FileIoRow>> GetLatestFileIoStatsAsync(int serverId)
     delta_write_bytes,
     delta_stall_read_ms,
     delta_stall_write_ms
-FROM file_io_stats
+FROM v_file_io_stats
 WHERE server_id = $1
-AND   collection_time = (SELECT MAX(collection_time) FROM file_io_stats WHERE server_id = $1)
+AND   collection_time = (SELECT MAX(collection_time) FROM v_file_io_stats WHERE server_id = $1)
 ORDER BY (delta_stall_read_ms + delta_stall_write_ms) DESC";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
@@ -81,7 +81,7 @@ public async Task<List<FileIoTrendPoint>> GetFileIoLatencyTrendAsync(int serverI
     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 file_io_stats
+FROM v_file_io_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -124,7 +124,7 @@ public async Task<List<FileIoTrendPoint>> GetTempDbFileIoTrendAsync(int serverId
     file_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 file_io_stats
+FROM v_file_io_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
diff --git a/Lite/Services/LocalDataService.Memory.cs b/Lite/Services/LocalDataService.Memory.cs
index 07612ee7..55869c47 100644
--- a/Lite/Services/LocalDataService.Memory.cs
+++ b/Lite/Services/LocalDataService.Memory.cs
@@ -35,7 +35,7 @@ public partial class LocalDataService
     total_server_memory_mb,
     buffer_pool_mb,
     plan_cache_mb
-FROM memory_stats
+FROM v_memory_stats
 WHERE server_id = $1
 ORDER BY collection_time DESC
 LIMIT 1";
@@ -81,7 +81,7 @@ public async Task<List<MemoryTrendPoint>> GetMemoryTrendAsync(int serverId, int
     target_server_memory_mb,
     buffer_pool_mb,
     plan_cache_mb
-FROM memory_stats
+FROM v_memory_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -117,9 +117,9 @@ public async Task<List<MemoryClerkRow>> GetLatestMemoryClerksAsync(int serverId)
         using var command = connection.CreateCommand();
         command.CommandText = @"
 SELECT clerk_type, memory_mb
-FROM memory_clerks
+FROM v_memory_clerks
 WHERE server_id = $1
-AND   collection_time = (SELECT MAX(collection_time) FROM memory_clerks WHERE server_id = $1)
+AND   collection_time = (SELECT MAX(collection_time) FROM v_memory_clerks WHERE server_id = $1)
 ORDER BY memory_mb DESC";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
diff --git a/Lite/Services/LocalDataService.Overview.cs b/Lite/Services/LocalDataService.Overview.cs
index 2c9789be..b86f6c4a 100644
--- a/Lite/Services/LocalDataService.Overview.cs
+++ b/Lite/Services/LocalDataService.Overview.cs
@@ -34,7 +34,7 @@ public partial class LocalDataService
         {
             cmd.CommandText = @"
 SELECT sqlserver_cpu_utilization, sample_time
-FROM cpu_utilization_stats
+FROM v_cpu_utilization_stats
 WHERE server_id = $1
 ORDER BY sample_time DESC
 LIMIT 1";
@@ -52,7 +52,7 @@ ORDER BY sample_time DESC
         {
             cmd.CommandText = @"
 SELECT total_server_memory_mb
-FROM memory_stats
+FROM v_memory_stats
 WHERE server_id = $1
 ORDER BY collection_time DESC
 LIMIT 1";
@@ -69,7 +69,7 @@ ORDER BY collection_time DESC
         {
             cmd.CommandText = @"
 SELECT COUNT(*)
-FROM blocked_process_reports
+FROM v_blocked_process_reports
 WHERE server_id = $1
 AND   event_time >= $2";
             cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
@@ -83,7 +83,7 @@ FROM blocked_process_reports
         {
             cmd.CommandText = @"
 SELECT COUNT(*)
-FROM deadlocks
+FROM v_deadlocks
 WHERE server_id = $1
 AND   deadlock_time >= $2";
             cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
@@ -97,7 +97,7 @@ FROM deadlocks
         {
             cmd.CommandText = @"
 SELECT MAX(collection_time)
-FROM collection_log
+FROM v_collection_log
 WHERE server_id = $1";
             cmd.Parameters.Add(new DuckDBParameter { Value = serverId });
             var result = await cmd.ExecuteScalarAsync();
diff --git a/Lite/Services/LocalDataService.Perfmon.cs b/Lite/Services/LocalDataService.Perfmon.cs
index 74a07e47..f748846c 100644
--- a/Lite/Services/LocalDataService.Perfmon.cs
+++ b/Lite/Services/LocalDataService.Perfmon.cs
@@ -28,9 +28,9 @@ public async Task<List<PerfmonRow>> GetLatestPerfmonStatsAsync(int serverId)
     instance_name,
     cntr_value,
     delta_cntr_value
-FROM perfmon_stats
+FROM v_perfmon_stats
 WHERE server_id = $1
-AND   collection_time = (SELECT MAX(collection_time) FROM perfmon_stats WHERE server_id = $1)
+AND   collection_time = (SELECT MAX(collection_time) FROM v_perfmon_stats WHERE server_id = $1)
 ORDER BY counter_name";
 
         command.Parameters.Add(new DuckDBParameter { Value = serverId });
@@ -63,7 +63,7 @@ public async Task<List<string>> GetDistinctPerfmonCountersAsync(int serverId, in
 
         command.CommandText = @"
 SELECT DISTINCT counter_name
-FROM perfmon_stats
+FROM v_perfmon_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -97,7 +97,7 @@ public async Task<List<PerfmonTrendPoint>> GetPerfmonTrendAsync(int serverId, st
     collection_time,
     cntr_value,
     delta_cntr_value
-FROM perfmon_stats
+FROM v_perfmon_stats
 WHERE server_id = $1
 AND   counter_name = $2
 AND   collection_time >= $3
diff --git a/Lite/Services/LocalDataService.QueryStats.cs b/Lite/Services/LocalDataService.QueryStats.cs
index fd4bafaf..0ed8a34c 100644
--- a/Lite/Services/LocalDataService.QueryStats.cs
+++ b/Lite/Services/LocalDataService.QueryStats.cs
@@ -66,7 +66,7 @@ public async Task<List<QueryStatsRow>> GetTopQueriesByCpuAsync(int serverId, int
     MAX(plan_handle) AS plan_handle,
     MAX(query_text) AS query_text,
     MAX(query_plan_xml) AS query_plan
-FROM query_stats
+FROM v_query_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -139,7 +139,7 @@ public async Task<List<QueryStatsHistoryRow>> GetQueryStatsHistoryAsync(int serv
     max_elapsed_time,
     query_plan_xml,
     query_plan_hash
-FROM query_stats
+FROM v_query_stats
 WHERE server_id = $1
 AND   database_name = $2
 AND   query_hash = $3
@@ -196,7 +196,7 @@ public async Task<List<ProcedureStatsHistoryRow>> GetProcedureStatsHistoryAsync(
     delta_logical_reads,
     delta_logical_writes,
     delta_physical_reads
-FROM procedure_stats
+FROM v_procedure_stats
 WHERE server_id = $1
 AND   database_name = $2
 AND   schema_name = $3
@@ -330,7 +330,7 @@ public async Task<List<ProcedureStatsRow>> GetTopProceduresByCpuAsync(int server
     SUM(total_spills) AS total_spills,
     MAX(sql_handle) AS sql_handle,
     MAX(plan_handle) AS plan_handle
-FROM procedure_stats
+FROM v_procedure_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -389,7 +389,7 @@ WITH raw AS
         SUM(delta_elapsed_time) / 1000.0 AS total_elapsed_ms,
         SUM(delta_execution_count) AS total_executions,
         date_diff('second', LAG(collection_time) OVER (ORDER BY collection_time), collection_time) AS interval_seconds
-    FROM query_stats
+    FROM v_query_stats
     WHERE server_id = $1
     AND   collection_time >= $2
     AND   collection_time <= $3
@@ -438,7 +438,7 @@ WITH raw AS
         SUM(delta_elapsed_time) / 1000.0 AS total_elapsed_ms,
         SUM(delta_execution_count) AS total_executions,
         date_diff('second', LAG(collection_time) OVER (ORDER BY collection_time), collection_time) AS interval_seconds
-    FROM procedure_stats
+    FROM v_procedure_stats
     WHERE server_id = $1
     AND   collection_time >= $2
     AND   collection_time <= $3
@@ -486,7 +486,7 @@ WITH raw AS
         collection_time,
         SUM(delta_execution_count) AS total_executions,
         date_diff('second', LAG(collection_time) OVER (ORDER BY collection_time), collection_time) AS interval_seconds
-    FROM query_stats
+    FROM v_query_stats
     WHERE server_id = $1
     AND   collection_time >= $2
     AND   collection_time <= $3
diff --git a/Lite/Services/LocalDataService.QueryStore.cs b/Lite/Services/LocalDataService.QueryStore.cs
index b492ae72..d68ae69c 100644
--- a/Lite/Services/LocalDataService.QueryStore.cs
+++ b/Lite/Services/LocalDataService.QueryStore.cs
@@ -44,7 +44,7 @@ public async Task<List<QueryStoreRow>> GetQueryStoreTopQueriesAsync(int serverId
     AVG(avg_rowcount) AS avg_rowcount,
     MAX(last_execution_time) AS last_execution_time,
     MAX(query_plan_hash) AS query_plan_hash
-FROM query_store_stats
+FROM v_query_store_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -102,7 +102,7 @@ public async Task<List<QueryStoreHistoryRow>> GetQueryStoreHistoryAsync(int serv
     avg_physical_reads,
     avg_rowcount,
     last_execution_time
-FROM query_store_stats
+FROM v_query_store_stats
 WHERE server_id = $1
 AND   database_name = $2
 AND   query_id = $3
@@ -146,7 +146,7 @@ public async Task<List<string>> GetQueryStoreDatabasesAsync(int serverId, int ho
         using var command = connection.CreateCommand();
         command.CommandText = @"
 SELECT DISTINCT database_name
-FROM query_store_stats
+FROM v_query_store_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 ORDER BY database_name";
@@ -221,7 +221,7 @@ WITH raw AS
         SUM(execution_count * avg_duration_ms) 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 query_store_stats
+    FROM v_query_store_stats
     WHERE server_id = $1
     AND   collection_time >= $2
     AND   collection_time <= $3
diff --git a/Lite/Services/LocalDataService.TempDb.cs b/Lite/Services/LocalDataService.TempDb.cs
index 0b4e1bba..9b9ea7fe 100644
--- a/Lite/Services/LocalDataService.TempDb.cs
+++ b/Lite/Services/LocalDataService.TempDb.cs
@@ -36,7 +36,7 @@ public async Task<List<TempDbRow>> GetTempDbTrendAsync(int serverId, int hoursBa
     total_sessions_using_tempdb,
     top_session_id,
     top_session_tempdb_mb
-FROM tempdb_stats
+FROM v_tempdb_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -84,7 +84,7 @@ FROM tempdb_stats
     version_store_reserved_mb,
     top_session_tempdb_mb,
     top_session_id
-FROM tempdb_stats
+FROM v_tempdb_stats
 WHERE server_id = $1
 ORDER BY collection_time DESC
 LIMIT 1";
diff --git a/Lite/Services/LocalDataService.WaitStats.cs b/Lite/Services/LocalDataService.WaitStats.cs
index 406bdd57..f7f1a313 100644
--- a/Lite/Services/LocalDataService.WaitStats.cs
+++ b/Lite/Services/LocalDataService.WaitStats.cs
@@ -32,7 +32,7 @@ public async Task<List<WaitStatsRow>> GetWaitStatsAsync(int serverId, int hoursB
     SUM(delta_wait_time_ms) AS total_wait_time_ms,
     SUM(delta_signal_wait_time_ms) AS total_signal_wait_time_ms,
     COUNT(*) AS sample_count
-FROM wait_stats
+FROM v_wait_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -75,7 +75,7 @@ public async Task<List<string>> GetDistinctWaitTypesAsync(int serverId, int hour
 SELECT
     wait_type,
     SUM(delta_wait_time_ms) AS total_delta
-FROM wait_stats
+FROM v_wait_stats
 WHERE server_id = $1
 AND   collection_time >= $2
 AND   collection_time <= $3
@@ -114,7 +114,7 @@ WITH raw AS
         delta_signal_wait_time_ms,
         delta_waiting_tasks,
         date_diff('second', LAG(collection_time) OVER (ORDER BY collection_time), collection_time) AS interval_seconds
-    FROM wait_stats
+    FROM v_wait_stats
     WHERE server_id = $1
     AND   wait_type = $2
     AND   collection_time >= $3
@@ -166,7 +166,7 @@ public async Task<List<PoisonWaitDelta>> GetLatestPoisonWaitAvgsAsync(int server
     CASE WHEN delta_waiting_tasks > 0
     THEN CAST(delta_wait_time_ms AS DOUBLE) / delta_waiting_tasks
     ELSE 0 END AS avg_ms_per_wait
-FROM wait_stats
+FROM v_wait_stats
 WHERE server_id = $1
 AND wait_type IN ('THREADPOOL', 'RESOURCE_SEMAPHORE', 'RESOURCE_SEMAPHORE_QUERY_COMPILE')
 AND delta_waiting_tasks > 0
@@ -213,11 +213,13 @@ public async Task<List<LongRunningQueryInfo>> GetLongRunningQueriesAsync(int ser
     writes,
     wait_type,
     blocking_session_id
-FROM query_snapshots
+FROM v_query_snapshots
 WHERE server_id = $1
-AND collection_time = (SELECT MAX(collection_time) FROM query_snapshots WHERE server_id = $1)
+AND collection_time = (SELECT MAX(collection_time) FROM v_query_snapshots WHERE server_id = $1)
 AND session_id > 50
 AND total_elapsed_time_ms >= $2
+AND query_text NOT LIKE '%waitfor delay%'
+AND query_text NOT LIKE '%waitfor receive%'
 ORDER BY total_elapsed_time_ms DESC
 LIMIT 5";
 
diff --git a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
index 7c6da3d3..f81df834 100644
--- a/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
+++ b/Lite/Services/RemoteCollectorService.BlockedProcessReport.cs
@@ -390,71 +390,76 @@ as it lingers in the ring buffer across collection cycles. */
             _lastSqlMs = sqlSw.ElapsedMilliseconds;
 
             var duckSw = Stopwatch.StartNew();
-            using var duckConnection = _duckDb.CreateConnection();
-            await duckConnection.OpenAsync(cancellationToken);
 
-            using var appender = duckConnection.CreateAppender("blocked_process_reports");
-
-            while (await reader.ReadAsync(cancellationToken))
+            using (var duckConnection = _duckDb.CreateConnection())
             {
-                var eventTime = reader.IsDBNull(0) ? (DateTime?)null : reader.GetDateTime(0);
-                var reportXml = reader.IsDBNull(1) ? null : reader.GetString(1);
-
-                if (string.IsNullOrEmpty(reportXml))
-                {
-                    continue;
-                }
+                await duckConnection.OpenAsync(cancellationToken);
 
-                /* Parse the blocked process report XML in C# */
-                var parsed = ParseBlockedProcessReportXml(reportXml, eventTime);
-                if (parsed == null)
+                using (var appender = duckConnection.CreateAppender("blocked_process_reports"))
                 {
-                    continue;
+                    while (await reader.ReadAsync(cancellationToken))
+                    {
+                        var eventTime = reader.IsDBNull(0) ? (DateTime?)null : reader.GetDateTime(0);
+                        var reportXml = reader.IsDBNull(1) ? null : reader.GetString(1);
+
+                        if (string.IsNullOrEmpty(reportXml))
+                        {
+                            continue;
+                        }
+
+                        /* Parse the blocked process report XML in C# */
+                        var parsed = ParseBlockedProcessReportXml(reportXml, eventTime);
+                        if (parsed == null)
+                        {
+                            continue;
+                        }
+
+                        var row = appender.CreateRow();
+                        row.AppendValue(GenerateCollectionId())
+                           .AppendValue(collectionTime)
+                           .AppendValue(serverId)
+                           .AppendValue(server.ServerName)
+                           .AppendValue(parsed.EventTime)
+                           .AppendValue(parsed.DatabaseName)
+                           .AppendValue(parsed.BlockedSpid)
+                           .AppendValue(parsed.BlockedEcid)
+                           .AppendValue(parsed.BlockingSpid)
+                           .AppendValue(parsed.BlockingEcid)
+                           .AppendValue(parsed.WaitTimeMs)
+                           .AppendValue(parsed.WaitResource)
+                           .AppendValue(parsed.LockMode)
+                           .AppendValue(parsed.BlockedStatus)
+                           .AppendValue(parsed.BlockedIsolationLevel)
+                           .AppendValue(parsed.BlockedLogUsed)
+                           .AppendValue(parsed.BlockedTransactionCount)
+                           .AppendValue(parsed.BlockedClientApp)
+                           .AppendValue(parsed.BlockedHostName)
+                           .AppendValue(parsed.BlockedLoginName)
+                           .AppendValue(parsed.BlockedSqlText)
+                           .AppendValue(parsed.BlockingStatus)
+                           .AppendValue(parsed.BlockingIsolationLevel)
+                           .AppendValue(parsed.BlockingClientApp)
+                           .AppendValue(parsed.BlockingHostName)
+                           .AppendValue(parsed.BlockingLoginName)
+                           .AppendValue(parsed.BlockingSqlText)
+                           .AppendValue(parsed.BlockedTransactionName)
+                           .AppendValue(parsed.BlockingTransactionName)
+                           .AppendValue(parsed.BlockedLastTranStarted)
+                           .AppendValue(parsed.BlockingLastTranStarted)
+                           .AppendValue(parsed.BlockedLastBatchStarted)
+                           .AppendValue(parsed.BlockingLastBatchStarted)
+                           .AppendValue(parsed.BlockedLastBatchCompleted)
+                           .AppendValue(parsed.BlockingLastBatchCompleted)
+                           .AppendValue(parsed.BlockedPriority)
+                           .AppendValue(parsed.BlockingPriority)
+                           .AppendValue(reportXml)
+                           .EndRow();
+
+                        rowsCollected++;
+                    }
                 }
-
-                var row = appender.CreateRow();
-                row.AppendValue(GenerateCollectionId())
-                   .AppendValue(collectionTime)
-                   .AppendValue(serverId)
-                   .AppendValue(server.ServerName)
-                   .AppendValue(parsed.EventTime)
-                   .AppendValue(parsed.DatabaseName)
-                   .AppendValue(parsed.BlockedSpid)
-                   .AppendValue(parsed.BlockedEcid)
-                   .AppendValue(parsed.BlockingSpid)
-                   .AppendValue(parsed.BlockingEcid)
-                   .AppendValue(parsed.WaitTimeMs)
-                   .AppendValue(parsed.WaitResource)
-                   .AppendValue(parsed.LockMode)
-                   .AppendValue(parsed.BlockedStatus)
-                   .AppendValue(parsed.BlockedIsolationLevel)
-                   .AppendValue(parsed.BlockedLogUsed)
-                   .AppendValue(parsed.BlockedTransactionCount)
-                   .AppendValue(parsed.BlockedClientApp)
-                   .AppendValue(parsed.BlockedHostName)
-                   .AppendValue(parsed.BlockedLoginName)
-                   .AppendValue(parsed.BlockedSqlText)
-                   .AppendValue(parsed.BlockingStatus)
-                   .AppendValue(parsed.BlockingIsolationLevel)
-                   .AppendValue(parsed.BlockingClientApp)
-                   .AppendValue(parsed.BlockingHostName)
-                   .AppendValue(parsed.BlockingLoginName)
-                   .AppendValue(parsed.BlockingSqlText)
-                   .AppendValue(parsed.BlockedTransactionName)
-                   .AppendValue(parsed.BlockingTransactionName)
-                   .AppendValue(parsed.BlockedLastTranStarted)
-                   .AppendValue(parsed.BlockingLastTranStarted)
-                   .AppendValue(parsed.BlockedLastBatchStarted)
-                   .AppendValue(parsed.BlockingLastBatchStarted)
-                   .AppendValue(parsed.BlockedLastBatchCompleted)
-                   .AppendValue(parsed.BlockingLastBatchCompleted)
-                   .AppendValue(parsed.BlockedPriority)
-                   .AppendValue(parsed.BlockingPriority)
-                   .AppendValue(reportXml)
-                   .EndRow();
-
-                rowsCollected++;
             }
+
             duckSw.Stop();
             _lastDuckDbMs = duckSw.ElapsedMilliseconds;
         }
diff --git a/Lite/Services/RemoteCollectorService.Cpu.cs b/Lite/Services/RemoteCollectorService.Cpu.cs
index 09fd6df5..800fb01c 100644
--- a/Lite/Services/RemoteCollectorService.Cpu.cs
+++ b/Lite/Services/RemoteCollectorService.Cpu.cs
@@ -128,30 +128,34 @@ drs.end_time DESC
 
         /* Insert into DuckDB using Appender for bulk performance */
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("cpu_utilization_stats");
-
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var sampleTime = reader.GetDateTime(0);
-
-            /* Client-side dedup for ring buffer (computed sample_time can't be filtered in SQL) */
-            if (!isAzureSqlDb && lastSampleTime.HasValue && sampleTime <= lastSampleTime.Value)
-                continue;
-
-            var row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())
-               .AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue(sampleTime)
-               .AppendValue(reader.IsDBNull(1) ? 0 : reader.GetInt32(1))
-               .AppendValue(reader.IsDBNull(2) ? 0 : reader.GetInt32(2))
-               .EndRow();
-
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("cpu_utilization_stats"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    var sampleTime = reader.GetDateTime(0);
+
+                    /* Client-side dedup for ring buffer (computed sample_time can't be filtered in SQL) */
+                    if (!isAzureSqlDb && lastSampleTime.HasValue && sampleTime <= lastSampleTime.Value)
+                        continue;
+
+                    var row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())
+                       .AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue(sampleTime)
+                       .AppendValue(reader.IsDBNull(1) ? 0 : reader.GetInt32(1))
+                       .AppendValue(reader.IsDBNull(2) ? 0 : reader.GetInt32(2))
+                       .EndRow();
+
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.Deadlocks.cs b/Lite/Services/RemoteCollectorService.Deadlocks.cs
index 2ff5e9f9..5fc79330 100644
--- a/Lite/Services/RemoteCollectorService.Deadlocks.cs
+++ b/Lite/Services/RemoteCollectorService.Deadlocks.cs
@@ -388,26 +388,31 @@ and was previously misattributed as DuckDB time. */
             }
 
             var duckSw = Stopwatch.StartNew();
-            using var duckConnection = _duckDb.CreateConnection();
-            await duckConnection.OpenAsync(cancellationToken);
 
-            using var appender = duckConnection.CreateAppender("deadlocks");
-
-            foreach (var (deadlockTime, victimProcessId, victimSqlText, graphXml) in deadlockRows)
+            using (var duckConnection = _duckDb.CreateConnection())
             {
-                var row = appender.CreateRow();
-                row.AppendValue(GenerateCollectionId())
-                   .AppendValue(collectionTime)
-                   .AppendValue(serverId)
-                   .AppendValue(server.ServerName)
-                   .AppendValue(deadlockTime)
-                   .AppendValue(victimProcessId)
-                   .AppendValue(victimSqlText)
-                   .AppendValue(graphXml)
-                   .EndRow();
-
-                rowsCollected++;
+                await duckConnection.OpenAsync(cancellationToken);
+
+                using (var appender = duckConnection.CreateAppender("deadlocks"))
+                {
+                    foreach (var (deadlockTime, victimProcessId, victimSqlText, graphXml) in deadlockRows)
+                    {
+                        var row = appender.CreateRow();
+                        row.AppendValue(GenerateCollectionId())
+                           .AppendValue(collectionTime)
+                           .AppendValue(serverId)
+                           .AppendValue(server.ServerName)
+                           .AppendValue(deadlockTime)
+                           .AppendValue(victimProcessId)
+                           .AppendValue(victimSqlText)
+                           .AppendValue(graphXml)
+                           .EndRow();
+
+                        rowsCollected++;
+                    }
+                }
             }
+
             duckSw.Stop();
             _lastDuckDbMs = duckSw.ElapsedMilliseconds;
         }
diff --git a/Lite/Services/RemoteCollectorService.FileIo.cs b/Lite/Services/RemoteCollectorService.FileIo.cs
index e829e143..1681624a 100644
--- a/Lite/Services/RemoteCollectorService.FileIo.cs
+++ b/Lite/Services/RemoteCollectorService.FileIo.cs
@@ -120,46 +120,50 @@ AND   vfs.database_id < 32761
 
         /* Insert into DuckDB with delta calculations */
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("file_io_stats");
-
-        foreach (var stat in fileStats)
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var deltaKey = $"{stat.DatabaseId}_{stat.FileId}";
-            var deltaReads = _deltaCalculator.CalculateDelta(serverId, "file_io_reads", deltaKey, stat.NumOfReads);
-            var deltaWrites = _deltaCalculator.CalculateDelta(serverId, "file_io_writes", deltaKey, stat.NumOfWrites);
-            var deltaReadBytes = _deltaCalculator.CalculateDelta(serverId, "file_io_read_bytes", deltaKey, stat.ReadBytes);
-            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 row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())
-               .AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue(stat.DatabaseName)
-               .AppendValue(stat.FileName)
-               .AppendValue(stat.FileType)
-               .AppendValue(stat.PhysicalName)
-               .AppendValue(stat.SizeMb)
-               .AppendValue(stat.NumOfReads)
-               .AppendValue(stat.NumOfWrites)
-               .AppendValue(stat.ReadBytes)
-               .AppendValue(stat.WriteBytes)
-               .AppendValue(stat.IoStallReadMs)
-               .AppendValue(stat.IoStallWriteMs)
-               .AppendValue(deltaReads)
-               .AppendValue(deltaWrites)
-               .AppendValue(deltaReadBytes)
-               .AppendValue(deltaWriteBytes)
-               .AppendValue(deltaStallReadMs)
-               .AppendValue(deltaStallWriteMs)
-               .EndRow();
-
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("file_io_stats"))
+            {
+                foreach (var stat in fileStats)
+                {
+                    var deltaKey = $"{stat.DatabaseId}_{stat.FileId}";
+                    var deltaReads = _deltaCalculator.CalculateDelta(serverId, "file_io_reads", deltaKey, stat.NumOfReads);
+                    var deltaWrites = _deltaCalculator.CalculateDelta(serverId, "file_io_writes", deltaKey, stat.NumOfWrites);
+                    var deltaReadBytes = _deltaCalculator.CalculateDelta(serverId, "file_io_read_bytes", deltaKey, stat.ReadBytes);
+                    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 row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())
+                       .AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue(stat.DatabaseName)
+                       .AppendValue(stat.FileName)
+                       .AppendValue(stat.FileType)
+                       .AppendValue(stat.PhysicalName)
+                       .AppendValue(stat.SizeMb)
+                       .AppendValue(stat.NumOfReads)
+                       .AppendValue(stat.NumOfWrites)
+                       .AppendValue(stat.ReadBytes)
+                       .AppendValue(stat.WriteBytes)
+                       .AppendValue(stat.IoStallReadMs)
+                       .AppendValue(stat.IoStallWriteMs)
+                       .AppendValue(deltaReads)
+                       .AppendValue(deltaWrites)
+                       .AppendValue(deltaReadBytes)
+                       .AppendValue(deltaWriteBytes)
+                       .AppendValue(deltaStallReadMs)
+                       .AppendValue(deltaStallWriteMs)
+                       .EndRow();
+
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.Memory.cs b/Lite/Services/RemoteCollectorService.Memory.cs
index 4531413b..e9ac7e90 100644
--- a/Lite/Services/RemoteCollectorService.Memory.cs
+++ b/Lite/Services/RemoteCollectorService.Memory.cs
@@ -146,26 +146,31 @@ FROM sys.dm_os_performance_counters
 
         /* Insert into DuckDB using Appender */
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
-
-        using var appender = duckConnection.CreateAppender("memory_stats");
-        var row = appender.CreateRow();
-        row.AppendValue(GenerateCollectionId())
-           .AppendValue(collectionTime)
-           .AppendValue(serverId)
-           .AppendValue(server.ServerName)
-           .AppendValue(totalPhysicalMb)
-           .AppendValue(availablePhysicalMb)
-           .AppendValue(totalPageFileMb)
-           .AppendValue(availablePageFileMb)
-           .AppendValue(systemMemoryState)
-           .AppendValue(sqlMemoryModel)
-           .AppendValue(targetServerMemoryMb)
-           .AppendValue(totalServerMemoryMb)
-           .AppendValue(bufferPoolMb)
-           .AppendValue(planCacheMb)
-           .EndRow();
+
+        using (var duckConnection = _duckDb.CreateConnection())
+        {
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("memory_stats"))
+            {
+                var row = appender.CreateRow();
+                row.AppendValue(GenerateCollectionId())
+                   .AppendValue(collectionTime)
+                   .AppendValue(serverId)
+                   .AppendValue(server.ServerName)
+                   .AppendValue(totalPhysicalMb)
+                   .AppendValue(availablePhysicalMb)
+                   .AppendValue(totalPageFileMb)
+                   .AppendValue(availablePageFileMb)
+                   .AppendValue(systemMemoryState)
+                   .AppendValue(sqlMemoryModel)
+                   .AppendValue(targetServerMemoryMb)
+                   .AppendValue(totalServerMemoryMb)
+                   .AppendValue(bufferPoolMb)
+                   .AppendValue(planCacheMb)
+                   .EndRow();
+            }
+        }
 
         duckSw.Stop();
         _lastSqlMs = sqlSw.ElapsedMilliseconds;
@@ -211,23 +216,27 @@ ORDER BY
 
         /* Insert into DuckDB */
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
-
-        using var appender = duckConnection.CreateAppender("memory_clerks");
 
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())
-               .AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue(reader.GetString(0))
-               .AppendValue(reader.GetDecimal(1))
-               .EndRow();
-
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("memory_clerks"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    var row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())
+                       .AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue(reader.GetString(0))
+                       .AppendValue(reader.GetDecimal(1))
+                       .EndRow();
+
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.MemoryGrants.cs b/Lite/Services/RemoteCollectorService.MemoryGrants.cs
index fd455f18..dfaeab5e 100644
--- a/Lite/Services/RemoteCollectorService.MemoryGrants.cs
+++ b/Lite/Services/RemoteCollectorService.MemoryGrants.cs
@@ -84,32 +84,37 @@ WHERE mg.session_id <> @@SPID
         sqlSw.Stop();
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("memory_grant_stats");
-        foreach (var r in rows)
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            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.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)
-               .EndRow();
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("memory_grant_stats"))
+            {
+                foreach (var r in rows)
+                {
+                    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.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)
+                       .EndRow();
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.Perfmon.cs b/Lite/Services/RemoteCollectorService.Perfmon.cs
index 9d48c48a..867f878a 100644
--- a/Lite/Services/RemoteCollectorService.Perfmon.cs
+++ b/Lite/Services/RemoteCollectorService.Perfmon.cs
@@ -149,36 +149,40 @@ WHERE pc.counter_name IN (
         _lastSqlMs = sqlSw.ElapsedMilliseconds;
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("perfmon_stats");
-
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var objectName = reader.IsDBNull(0) ? "" : reader.GetString(0);
-            var counterName = reader.IsDBNull(1) ? "" : reader.GetString(1);
-            var instanceName = reader.IsDBNull(2) ? "" : reader.GetString(2);
-            var cntrValue = reader.GetInt64(3);
-
-            /* Delta for per-second counters */
-            var deltaKey = $"{objectName}|{counterName}|{instanceName}";
-            var deltaCntrValue = _deltaCalculator.CalculateDelta(serverId, "perfmon", deltaKey, cntrValue);
-
-            var row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())
-               .AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue(objectName)
-               .AppendValue(counterName)
-               .AppendValue(instanceName)
-               .AppendValue(cntrValue)
-               .AppendValue(deltaCntrValue)
-               .AppendValue(600) /* 10-minute interval */
-               .EndRow();
-
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("perfmon_stats"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    var objectName = reader.IsDBNull(0) ? "" : reader.GetString(0);
+                    var counterName = reader.IsDBNull(1) ? "" : reader.GetString(1);
+                    var instanceName = reader.IsDBNull(2) ? "" : reader.GetString(2);
+                    var cntrValue = reader.GetInt64(3);
+
+                    /* Delta for per-second counters */
+                    var deltaKey = $"{objectName}|{counterName}|{instanceName}";
+                    var deltaCntrValue = _deltaCalculator.CalculateDelta(serverId, "perfmon", deltaKey, cntrValue);
+
+                    var row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())
+                       .AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue(objectName)
+                       .AppendValue(counterName)
+                       .AppendValue(instanceName)
+                       .AppendValue(cntrValue)
+                       .AppendValue(deltaCntrValue)
+                       .AppendValue(600) /* 10-minute interval */
+                       .EndRow();
+
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.ProcedureStats.cs b/Lite/Services/RemoteCollectorService.ProcedureStats.cs
index a0c1eb52..acc6d653 100644
--- a/Lite/Services/RemoteCollectorService.ProcedureStats.cs
+++ b/Lite/Services/RemoteCollectorService.ProcedureStats.cs
@@ -199,71 +199,75 @@ ORDER BY s.total_elapsed_time DESC
         sqlSw.Stop();
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("procedure_stats");
-
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            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);
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("procedure_stats"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    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);
 
-            /* Delta key: database.schema.object */
-            var deltaKey = $"{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);
-            var deltaReads = _deltaCalculator.CalculateDelta(serverId, "proc_stats_reads", deltaKey, logicalReads);
-            var deltaWrites = _deltaCalculator.CalculateDelta(serverId, "proc_stats_writes", deltaKey, logicalWrites);
-            var deltaPhysReads = _deltaCalculator.CalculateDelta(serverId, "proc_stats_phys_reads", deltaKey, physicalReads);
+                    /* Delta key: database.schema.object */
+                    var deltaKey = $"{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);
+                    var deltaReads = _deltaCalculator.CalculateDelta(serverId, "proc_stats_reads", deltaKey, logicalReads);
+                    var deltaWrites = _deltaCalculator.CalculateDelta(serverId, "proc_stats_writes", deltaKey, logicalWrites);
+                    var deltaPhysReads = _deltaCalculator.CalculateDelta(serverId, "proc_stats_phys_reads", deltaKey, physicalReads);
 
-            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)
-               .EndRow();
+                    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)
+                       .EndRow();
 
-            rowsCollected++;
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.QuerySnapshots.cs b/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
index ee791fc9..894a8221 100644
--- a/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
+++ b/Lite/Services/RemoteCollectorService.QuerySnapshots.cs
@@ -103,41 +103,45 @@ AND   dest.text IS NOT NULL
         _lastSqlMs = sqlSw.ElapsedMilliseconds;
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("query_snapshots");
-
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())
-               .AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue(Convert.ToInt32(reader.GetValue(0)))                                       /* session_id */
-               .AppendValue(reader.IsDBNull(1) ? (string?)null : reader.GetString(1))                  /* database_name */
-               .AppendValue(reader.IsDBNull(2) ? (string?)null : reader.GetString(2))                  /* elapsed_time_formatted */
-               .AppendValue(reader.IsDBNull(3) ? (string?)null : reader.GetString(3))                  /* query_text */
-               .AppendValue(reader.IsDBNull(4) ? (string?)null : reader.GetString(4))                  /* query_plan */
-               .AppendValue(reader.IsDBNull(5) ? (string?)null : reader.GetValue(5)?.ToString())       /* live_query_plan (xml) */
-               .AppendValue(reader.IsDBNull(6) ? (string?)null : reader.GetString(6))                  /* status */
-               .AppendValue(reader.IsDBNull(7) ? 0 : Convert.ToInt32(reader.GetValue(7)))              /* blocking_session_id */
-               .AppendValue(reader.IsDBNull(8) ? (string?)null : reader.GetString(8))                  /* wait_type */
-               .AppendValue(reader.IsDBNull(9) ? 0L : Convert.ToInt64(reader.GetValue(9)))             /* wait_time_ms */
-               .AppendValue(reader.IsDBNull(10) ? (string?)null : reader.GetString(10))                /* wait_resource */
-               .AppendValue(reader.IsDBNull(11) ? 0L : Convert.ToInt64(reader.GetValue(11)))           /* cpu_time_ms */
-               .AppendValue(reader.IsDBNull(12) ? 0L : Convert.ToInt64(reader.GetValue(12)))           /* total_elapsed_time_ms */
-               .AppendValue(reader.IsDBNull(13) ? 0L : Convert.ToInt64(reader.GetValue(13)))           /* reads */
-               .AppendValue(reader.IsDBNull(14) ? 0L : Convert.ToInt64(reader.GetValue(14)))           /* writes */
-               .AppendValue(reader.IsDBNull(15) ? 0L : Convert.ToInt64(reader.GetValue(15)))           /* logical_reads */
-               .AppendValue(reader.IsDBNull(16) ? 0m : reader.GetDecimal(16))                            /* granted_query_memory_gb */
-               .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 */
-               .EndRow();
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("query_snapshots"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    var row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())
+                       .AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue(Convert.ToInt32(reader.GetValue(0)))                                       /* session_id */
+                       .AppendValue(reader.IsDBNull(1) ? (string?)null : reader.GetString(1))                  /* database_name */
+                       .AppendValue(reader.IsDBNull(2) ? (string?)null : reader.GetString(2))                  /* elapsed_time_formatted */
+                       .AppendValue(reader.IsDBNull(3) ? (string?)null : reader.GetString(3))                  /* query_text */
+                       .AppendValue(reader.IsDBNull(4) ? (string?)null : reader.GetString(4))                  /* query_plan */
+                       .AppendValue(reader.IsDBNull(5) ? (string?)null : reader.GetValue(5)?.ToString())       /* live_query_plan (xml) */
+                       .AppendValue(reader.IsDBNull(6) ? (string?)null : reader.GetString(6))                  /* status */
+                       .AppendValue(reader.IsDBNull(7) ? 0 : Convert.ToInt32(reader.GetValue(7)))              /* blocking_session_id */
+                       .AppendValue(reader.IsDBNull(8) ? (string?)null : reader.GetString(8))                  /* wait_type */
+                       .AppendValue(reader.IsDBNull(9) ? 0L : Convert.ToInt64(reader.GetValue(9)))             /* wait_time_ms */
+                       .AppendValue(reader.IsDBNull(10) ? (string?)null : reader.GetString(10))                /* wait_resource */
+                       .AppendValue(reader.IsDBNull(11) ? 0L : Convert.ToInt64(reader.GetValue(11)))           /* cpu_time_ms */
+                       .AppendValue(reader.IsDBNull(12) ? 0L : Convert.ToInt64(reader.GetValue(12)))           /* total_elapsed_time_ms */
+                       .AppendValue(reader.IsDBNull(13) ? 0L : Convert.ToInt64(reader.GetValue(13)))           /* reads */
+                       .AppendValue(reader.IsDBNull(14) ? 0L : Convert.ToInt64(reader.GetValue(14)))           /* writes */
+                       .AppendValue(reader.IsDBNull(15) ? 0L : Convert.ToInt64(reader.GetValue(15)))           /* logical_reads */
+                       .AppendValue(reader.IsDBNull(16) ? 0m : reader.GetDecimal(16))                            /* granted_query_memory_gb */
+                       .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 */
+                       .EndRow();
 
-            rowsCollected++;
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.QueryStats.cs b/Lite/Services/RemoteCollectorService.QueryStats.cs
index 497c4e7f..16774801 100644
--- a/Lite/Services/RemoteCollectorService.QueryStats.cs
+++ b/Lite/Services/RemoteCollectorService.QueryStats.cs
@@ -156,78 +156,82 @@ qs.total_elapsed_time DESC
         sqlSw.Stop();
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("query_stats");
-
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            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 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)
-               .EndRow();
-
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("query_stats"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    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 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)
+                       .EndRow();
+
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.QueryStore.cs b/Lite/Services/RemoteCollectorService.QueryStore.cs
index 127a3878..6f69db5e 100644
--- a/Lite/Services/RemoteCollectorService.QueryStore.cs
+++ b/Lite/Services/RemoteCollectorService.QueryStore.cs
@@ -74,15 +74,17 @@ ORDER BY d.name
         }
 
         var duckSw = new Stopwatch();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        /* For each database, collect new query store intervals since last collection */
-        foreach (var dbName in databases)
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            try
+            await duckConnection.OpenAsync(cancellationToken);
+
+            /* For each database, collect new query store intervals since last collection */
+            foreach (var dbName in databases)
             {
-                var qsQuery = $@"
+                try
+                {
+                    var qsQuery = $@"
 EXECUTE [{dbName.Replace("]", "]]")}].sys.sp_executesql
     N'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 
@@ -112,50 +114,54 @@ WHERE qsrs.last_execution_time > @cutoff_time
     N'@cutoff_time datetime2(7)',
     @cutoff_time;";
 
-                sqlSw.Start();
-                using var qsCommand = new SqlCommand(qsQuery, sqlConnection);
-                qsCommand.CommandTimeout = CommandTimeoutSeconds;
-                qsCommand.Parameters.Add(new SqlParameter("@cutoff_time", System.Data.SqlDbType.DateTime2) { Value = cutoffTime });
-
-                using var reader = await qsCommand.ExecuteReaderAsync(cancellationToken);
-                sqlSw.Stop();
-
-                duckSw.Start();
-                using var appender = duckConnection.CreateAppender("query_store_stats");
-
-                while (await reader.ReadAsync(cancellationToken))
+                    sqlSw.Start();
+                    using var qsCommand = new SqlCommand(qsQuery, sqlConnection);
+                    qsCommand.CommandTimeout = CommandTimeoutSeconds;
+                    qsCommand.Parameters.Add(new SqlParameter("@cutoff_time", System.Data.SqlDbType.DateTime2) { Value = cutoffTime });
+
+                    using var reader = await qsCommand.ExecuteReaderAsync(cancellationToken);
+                    sqlSw.Stop();
+
+                    duckSw.Start();
+
+                    using (var appender = duckConnection.CreateAppender("query_store_stats"))
+                    {
+                        while (await reader.ReadAsync(cancellationToken))
+                        {
+                            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))
+                               .EndRow();
+
+                            totalRows++;
+                        }
+                    }
+
+                    duckSw.Stop();
+                }
+                catch (SqlException ex)
                 {
-                    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))
-                       .EndRow();
-
-                    totalRows++;
+                    sqlSw.Stop();
+                    duckSw.Stop();
+                    _logger?.LogWarning("Failed to collect Query Store data from [{Database}] on '{Server}': {Message}",
+                        dbName, server.DisplayName, ex.Message);
                 }
-                duckSw.Stop();
-            }
-            catch (SqlException ex)
-            {
-                sqlSw.Stop();
-                duckSw.Stop();
-                _logger?.LogWarning("Failed to collect Query Store data from [{Database}] on '{Server}': {Message}",
-                    dbName, server.DisplayName, ex.Message);
             }
         }
 
diff --git a/Lite/Services/RemoteCollectorService.RunningJobs.cs b/Lite/Services/RemoteCollectorService.RunningJobs.cs
index 63c29de2..00d26b87 100644
--- a/Lite/Services/RemoteCollectorService.RunningJobs.cs
+++ b/Lite/Services/RemoteCollectorService.RunningJobs.cs
@@ -153,28 +153,33 @@ rj.current_duration_seconds DESC
         sqlSw.Stop();
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("running_jobs");
-        foreach (var r in rows)
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var row = appender.CreateRow();
-            row.AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue(r.JobName)
-               .AppendValue(r.JobId)
-               .AppendValue(r.JobEnabled)
-               .AppendValue(r.StartTime)
-               .AppendValue(r.CurrentDuration)
-               .AppendValue(r.AvgDuration)
-               .AppendValue(r.P95Duration)
-               .AppendValue(r.SuccessfulRunCount)
-               .AppendValue(r.IsRunningLong)
-               .AppendValue(r.PercentOfAverage)
-               .EndRow();
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("running_jobs"))
+            {
+                foreach (var r in rows)
+                {
+                    var row = appender.CreateRow();
+                    row.AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue(r.JobName)
+                       .AppendValue(r.JobId)
+                       .AppendValue(r.JobEnabled)
+                       .AppendValue(r.StartTime)
+                       .AppendValue(r.CurrentDuration)
+                       .AppendValue(r.AvgDuration)
+                       .AppendValue(r.P95Duration)
+                       .AppendValue(r.SuccessfulRunCount)
+                       .AppendValue(r.IsRunningLong)
+                       .AppendValue(r.PercentOfAverage)
+                       .EndRow();
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.ServerConfig.cs b/Lite/Services/RemoteCollectorService.ServerConfig.cs
index bf19492d..9adad481 100644
--- a/Lite/Services/RemoteCollectorService.ServerConfig.cs
+++ b/Lite/Services/RemoteCollectorService.ServerConfig.cs
@@ -96,22 +96,64 @@ ORDER BY c.name
 
     /// <summary>
     /// Collects database configuration from sys.databases. On-load only, not scheduled.
+    /// Version-gated columns are conditionally included based on the server's major version.
     /// </summary>
     private async Task<int> CollectDatabaseConfigAsync(ServerConnection server, CancellationToken cancellationToken)
     {
-        const string query = @"
-SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+        var serverStatus = _serverManager.GetConnectionStatus(server.Id);
+        var majorVersion = serverStatus.SqlMajorVersion;
 
-SELECT
+        /* Base columns available on all supported versions (2016+) */
+        var selectColumns = @"
     database_name = d.name,
+    state_desc = d.state_desc,
     compatibility_level = d.compatibility_level,
+    collation_name = d.collation_name,
     recovery_model = d.recovery_model_desc,
+    is_read_only = d.is_read_only,
     is_auto_close_on = d.is_auto_close_on,
     is_auto_shrink_on = d.is_auto_shrink_on,
+    is_auto_create_stats_on = d.is_auto_create_stats_on,
+    is_auto_update_stats_on = d.is_auto_update_stats_on,
+    is_auto_update_stats_async_on = d.is_auto_update_stats_async_on,
+    is_read_committed_snapshot_on = d.is_read_committed_snapshot_on,
+    snapshot_isolation_state = d.snapshot_isolation_state_desc,
+    is_parameterization_forced = d.is_parameterization_forced,
     is_query_store_on = d.is_query_store_on,
+    is_encrypted = d.is_encrypted,
+    is_trustworthy_on = d.is_trustworthy_on,
+    is_db_chaining_on = d.is_db_chaining_on,
+    is_broker_enabled = d.is_broker_enabled,
+    is_cdc_enabled = d.is_cdc_enabled,
+    is_mixed_page_allocation_on = d.is_mixed_page_allocation_on,
+    log_reuse_wait_desc = d.log_reuse_wait_desc,
     page_verify_option = d.page_verify_option_desc,
     target_recovery_time_seconds = d.target_recovery_time_in_seconds,
-    delayed_durability = d.delayed_durability_desc
+    delayed_durability = d.delayed_durability_desc";
+
+        /* SQL Server 2019+ (major version 15), or Azure SQL DB/MI which always have these */
+        var isAzure = serverStatus.SqlEngineEdition == 5 || serverStatus.SqlEngineEdition == 8;
+        var has2019Columns = majorVersion >= 15 || majorVersion == 0 || isAzure;
+        if (has2019Columns)
+        {
+            selectColumns += @",
+    is_accelerated_database_recovery_on = d.is_accelerated_database_recovery_on,
+    is_memory_optimized_enabled = d.is_memory_optimized_enabled";
+        }
+
+        /* SQL Server 2025+ (major version 17) */
+        var has2025Columns = majorVersion >= 17;
+        if (has2025Columns)
+        {
+            selectColumns += @",
+    is_optimized_locking_on = d.is_optimized_locking_on";
+        }
+
+        var query = $@"
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+
+SELECT
+{selectColumns}
 FROM sys.databases AS d
 WHERE (d.database_id > 4 OR d.database_id = 2)
 AND   d.database_id < 32761
@@ -125,7 +167,7 @@ ORDER BY d.name
         _lastSqlMs = 0;
         _lastDuckDbMs = 0;
 
-        var rows = new List<(string DbName, int CompatLevel, string? RecoveryModel, bool AutoClose, bool AutoShrink, bool QueryStore, string? PageVerify, int TargetRecovery, string? DelayedDurability)>();
+        var rows = new List<DatabaseConfigCollected>();
 
         var sqlSw = Stopwatch.StartNew();
         using var sqlConnection = await CreateConnectionAsync(server, cancellationToken);
@@ -135,16 +177,48 @@ ORDER BY d.name
         using var reader = await command.ExecuteReaderAsync(cancellationToken);
         while (await reader.ReadAsync(cancellationToken))
         {
-            rows.Add((
-                reader.GetString(0),
-                Convert.ToInt32(reader.GetValue(1)),
-                reader.IsDBNull(2) ? null : reader.GetString(2),
-                reader.GetBoolean(3),
-                reader.GetBoolean(4),
-                reader.GetBoolean(5),
-                reader.IsDBNull(6) ? null : reader.GetString(6),
-                Convert.ToInt32(reader.GetValue(7)),
-                reader.IsDBNull(8) ? null : reader.GetString(8)));
+            var ordinal = 0;
+            var r = new DatabaseConfigCollected
+            {
+                DbName = reader.GetString(ordinal++),
+                StateDesc = reader.IsDBNull(ordinal) ? null : reader.GetString(ordinal),
+                CompatLevel = reader.IsDBNull(++ordinal) ? 0 : Convert.ToInt32(reader.GetValue(ordinal)),
+                CollationName = reader.IsDBNull(++ordinal) ? null : reader.GetString(ordinal),
+                RecoveryModel = reader.IsDBNull(++ordinal) ? null : reader.GetString(ordinal),
+                IsReadOnly = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                AutoClose = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                AutoShrink = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                AutoCreateStats = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                AutoUpdateStats = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                AutoUpdateStatsAsync = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                Rcsi = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                SnapshotIsolation = reader.IsDBNull(++ordinal) ? null : reader.GetString(ordinal),
+                ParameterizationForced = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                QueryStore = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                Encrypted = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                Trustworthy = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                DbChaining = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                BrokerEnabled = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                CdcEnabled = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                MixedPageAllocation = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal),
+                LogReuseWait = reader.IsDBNull(++ordinal) ? null : reader.GetString(ordinal),
+                PageVerify = reader.IsDBNull(++ordinal) ? null : reader.GetString(ordinal),
+                TargetRecovery = reader.IsDBNull(++ordinal) ? 0 : Convert.ToInt32(reader.GetValue(ordinal)),
+                DelayedDurability = reader.IsDBNull(++ordinal) ? null : reader.GetString(ordinal),
+            };
+
+            if (has2019Columns)
+            {
+                r.AcceleratedDatabaseRecovery = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal);
+                r.MemoryOptimized = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal);
+            }
+
+            if (has2025Columns)
+            {
+                r.OptimizedLocking = !reader.IsDBNull(++ordinal) && reader.GetBoolean(ordinal);
+            }
+
+            rows.Add(r);
         }
         sqlSw.Stop();
 
@@ -161,15 +235,48 @@ ORDER BY d.name
                .AppendValue(serverId)
                .AppendValue(server.ServerName)
                .AppendValue(r.DbName)
+               .AppendValue(r.StateDesc)
                .AppendValue(r.CompatLevel)
+               .AppendValue(r.CollationName)
                .AppendValue(r.RecoveryModel)
+               .AppendValue(r.IsReadOnly)
                .AppendValue(r.AutoClose)
                .AppendValue(r.AutoShrink)
+               .AppendValue(r.AutoCreateStats)
+               .AppendValue(r.AutoUpdateStats)
+               .AppendValue(r.AutoUpdateStatsAsync)
+               .AppendValue(r.Rcsi)
+               .AppendValue(r.SnapshotIsolation)
+               .AppendValue(r.ParameterizationForced)
                .AppendValue(r.QueryStore)
+               .AppendValue(r.Encrypted)
+               .AppendValue(r.Trustworthy)
+               .AppendValue(r.DbChaining)
+               .AppendValue(r.BrokerEnabled)
+               .AppendValue(r.CdcEnabled)
+               .AppendValue(r.MixedPageAllocation)
+               .AppendValue(r.LogReuseWait)
                .AppendValue(r.PageVerify)
                .AppendValue(r.TargetRecovery)
-               .AppendValue(r.DelayedDurability)
-               .EndRow();
+               .AppendValue(r.DelayedDurability);
+
+            /* Version-gated columns: write value if collected, NULL otherwise */
+            if (r.AcceleratedDatabaseRecovery.HasValue)
+                row.AppendValue(r.AcceleratedDatabaseRecovery.Value);
+            else
+                row.AppendNullValue();
+
+            if (r.MemoryOptimized.HasValue)
+                row.AppendValue(r.MemoryOptimized.Value);
+            else
+                row.AppendNullValue();
+
+            if (r.OptimizedLocking.HasValue)
+                row.AppendValue(r.OptimizedLocking.Value);
+            else
+                row.AppendNullValue();
+
+            row.EndRow();
             rowsCollected++;
         }
 
@@ -181,6 +288,38 @@ ORDER BY d.name
         return rowsCollected;
     }
 
+    private class DatabaseConfigCollected
+    {
+        public string DbName { get; set; } = "";
+        public string? StateDesc { get; set; }
+        public int CompatLevel { get; set; }
+        public string? CollationName { get; set; }
+        public string? RecoveryModel { get; set; }
+        public bool IsReadOnly { get; set; }
+        public bool AutoClose { get; set; }
+        public bool AutoShrink { get; set; }
+        public bool AutoCreateStats { get; set; }
+        public bool AutoUpdateStats { get; set; }
+        public bool AutoUpdateStatsAsync { get; set; }
+        public bool Rcsi { get; set; }
+        public string? SnapshotIsolation { get; set; }
+        public bool ParameterizationForced { get; set; }
+        public bool QueryStore { get; set; }
+        public bool Encrypted { get; set; }
+        public bool Trustworthy { get; set; }
+        public bool DbChaining { get; set; }
+        public bool BrokerEnabled { get; set; }
+        public bool CdcEnabled { get; set; }
+        public bool MixedPageAllocation { get; set; }
+        public string? LogReuseWait { get; set; }
+        public string? PageVerify { get; set; }
+        public int TargetRecovery { get; set; }
+        public string? DelayedDurability { get; set; }
+        public bool? AcceleratedDatabaseRecovery { get; set; }
+        public bool? MemoryOptimized { get; set; }
+        public bool? OptimizedLocking { get; set; }
+    }
+
     /// <summary>
     /// Collects database-scoped configurations from sys.database_scoped_configurations
     /// for each online user database. On-load only, not scheduled.
diff --git a/Lite/Services/RemoteCollectorService.TempDb.cs b/Lite/Services/RemoteCollectorService.TempDb.cs
index 4cafdcef..ef0a300d 100644
--- a/Lite/Services/RemoteCollectorService.TempDb.cs
+++ b/Lite/Services/RemoteCollectorService.TempDb.cs
@@ -77,24 +77,29 @@ FROM sys.dm_db_session_space_usage AS ssu
 
         /* Insert into DuckDB using Appender */
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
-
-        using var appender = duckConnection.CreateAppender("tempdb_stats");
-        var row = appender.CreateRow();
-        row.AppendValue(GenerateCollectionId())
-           .AppendValue(collectionTime)
-           .AppendValue(serverId)
-           .AppendValue(server.ServerName)
-           .AppendValue(userObjMb)
-           .AppendValue(internalObjMb)
-           .AppendValue(versionStoreMb)
-           .AppendValue(totalReservedMb)
-           .AppendValue(unallocatedMb)
-           .AppendValue(totalSessions)
-           .AppendValue(topSessionId)
-           .AppendValue(topSessionMb)
-           .EndRow();
+
+        using (var duckConnection = _duckDb.CreateConnection())
+        {
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("tempdb_stats"))
+            {
+                var row = appender.CreateRow();
+                row.AppendValue(GenerateCollectionId())
+                   .AppendValue(collectionTime)
+                   .AppendValue(serverId)
+                   .AppendValue(server.ServerName)
+                   .AppendValue(userObjMb)
+                   .AppendValue(internalObjMb)
+                   .AppendValue(versionStoreMb)
+                   .AppendValue(totalReservedMb)
+                   .AppendValue(unallocatedMb)
+                   .AppendValue(totalSessions)
+                   .AppendValue(topSessionId)
+                   .AppendValue(topSessionMb)
+                   .EndRow();
+            }
+        }
 
         duckSw.Stop();
         _lastSqlMs = sqlSw.ElapsedMilliseconds;
diff --git a/Lite/Services/RemoteCollectorService.WaitStats.cs b/Lite/Services/RemoteCollectorService.WaitStats.cs
index 26ad9cb1..52767e7f 100644
--- a/Lite/Services/RemoteCollectorService.WaitStats.cs
+++ b/Lite/Services/RemoteCollectorService.WaitStats.cs
@@ -121,33 +121,37 @@ WHERE ws.wait_time_ms > 0
 
         /* Insert into DuckDB with delta calculations using Appender for bulk performance */
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("wait_stats");
-
-        foreach (var stat in waitStats)
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            var deltaKey = stat.WaitType;
-            var deltaWaitingTasks = _deltaCalculator.CalculateDelta(serverId, "wait_stats_tasks", deltaKey, stat.WaitingTasks);
-            var deltaWaitTimeMs = _deltaCalculator.CalculateDelta(serverId, "wait_stats_time", deltaKey, stat.WaitTimeMs);
-            var deltaSignalWaitTimeMs = _deltaCalculator.CalculateDelta(serverId, "wait_stats_signal", deltaKey, stat.SignalWaitTimeMs);
-
-            var row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())    /* collection_id BIGINT */
-               .AppendValue(collectionTime)            /* collection_time TIMESTAMP */
-               .AppendValue(serverId)                  /* server_id INTEGER */
-               .AppendValue(server.ServerName)         /* server_name VARCHAR */
-               .AppendValue(stat.WaitType)             /* wait_type VARCHAR */
-               .AppendValue(stat.WaitingTasks)         /* waiting_tasks_count BIGINT */
-               .AppendValue(stat.WaitTimeMs)           /* wait_time_ms BIGINT */
-               .AppendValue(stat.SignalWaitTimeMs)     /* signal_wait_time_ms BIGINT */
-               .AppendValue(deltaWaitingTasks)         /* delta_waiting_tasks BIGINT */
-               .AppendValue(deltaWaitTimeMs)           /* delta_wait_time_ms BIGINT */
-               .AppendValue(deltaSignalWaitTimeMs)     /* delta_signal_wait_time_ms BIGINT */
-               .EndRow();
-
-            rowsCollected++;
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("wait_stats"))
+            {
+                foreach (var stat in waitStats)
+                {
+                    var deltaKey = stat.WaitType;
+                    var deltaWaitingTasks = _deltaCalculator.CalculateDelta(serverId, "wait_stats_tasks", deltaKey, stat.WaitingTasks);
+                    var deltaWaitTimeMs = _deltaCalculator.CalculateDelta(serverId, "wait_stats_time", deltaKey, stat.WaitTimeMs);
+                    var deltaSignalWaitTimeMs = _deltaCalculator.CalculateDelta(serverId, "wait_stats_signal", deltaKey, stat.SignalWaitTimeMs);
+
+                    var row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())    /* collection_id BIGINT */
+                       .AppendValue(collectionTime)            /* collection_time TIMESTAMP */
+                       .AppendValue(serverId)                  /* server_id INTEGER */
+                       .AppendValue(server.ServerName)         /* server_name VARCHAR */
+                       .AppendValue(stat.WaitType)             /* wait_type VARCHAR */
+                       .AppendValue(stat.WaitingTasks)         /* waiting_tasks_count BIGINT */
+                       .AppendValue(stat.WaitTimeMs)           /* wait_time_ms BIGINT */
+                       .AppendValue(stat.SignalWaitTimeMs)     /* signal_wait_time_ms BIGINT */
+                       .AppendValue(deltaWaitingTasks)         /* delta_waiting_tasks BIGINT */
+                       .AppendValue(deltaWaitTimeMs)           /* delta_wait_time_ms BIGINT */
+                       .AppendValue(deltaSignalWaitTimeMs)     /* delta_signal_wait_time_ms BIGINT */
+                       .EndRow();
+
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.WaitingTasks.cs b/Lite/Services/RemoteCollectorService.WaitingTasks.cs
index 99a21022..888811e0 100644
--- a/Lite/Services/RemoteCollectorService.WaitingTasks.cs
+++ b/Lite/Services/RemoteCollectorService.WaitingTasks.cs
@@ -59,35 +59,39 @@ AND   wt.wait_type IS NOT NULL
         _lastSqlMs = sqlSw.ElapsedMilliseconds;
 
         var duckSw = Stopwatch.StartNew();
-        using var duckConnection = _duckDb.CreateConnection();
-        await duckConnection.OpenAsync(cancellationToken);
 
-        using var appender = duckConnection.CreateAppender("waiting_tasks");
-
-        while (await reader.ReadAsync(cancellationToken))
+        using (var duckConnection = _duckDb.CreateConnection())
         {
-            /* session_id and blocking_session_id are smallint in sys.dm_os_waiting_tasks */
-            var sessionId = reader.IsDBNull(0) ? 0 : reader.GetInt16(0);
-            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);
+            await duckConnection.OpenAsync(cancellationToken);
+
+            using (var appender = duckConnection.CreateAppender("waiting_tasks"))
+            {
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    /* session_id and blocking_session_id are smallint in sys.dm_os_waiting_tasks */
+                    var sessionId = reader.IsDBNull(0) ? 0 : reader.GetInt16(0);
+                    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 row = appender.CreateRow();
-            row.AppendValue(GenerateCollectionId())
-               .AppendValue(collectionTime)
-               .AppendValue(serverId)
-               .AppendValue(server.ServerName)
-               .AppendValue((int)sessionId)
-               .AppendValue(waitType)
-               .AppendValue(waitDurationMs)
-               .AppendValue(blockingSessionId.HasValue ? (int?)blockingSessionId.Value : null)
-               .AppendValue(resourceDescription)
-               .AppendValue(databaseName)
-               .EndRow();
+                    var row = appender.CreateRow();
+                    row.AppendValue(GenerateCollectionId())
+                       .AppendValue(collectionTime)
+                       .AppendValue(serverId)
+                       .AppendValue(server.ServerName)
+                       .AppendValue((int)sessionId)
+                       .AppendValue(waitType)
+                       .AppendValue(waitDurationMs)
+                       .AppendValue(blockingSessionId.HasValue ? (int?)blockingSessionId.Value : null)
+                       .AppendValue(resourceDescription)
+                       .AppendValue(databaseName)
+                       .EndRow();
 
-            rowsCollected++;
+                    rowsCollected++;
+                }
+            }
         }
 
         duckSw.Stop();
diff --git a/Lite/Services/RemoteCollectorService.cs b/Lite/Services/RemoteCollectorService.cs
index bda30b09..b2d9ad39 100644
--- a/Lite/Services/RemoteCollectorService.cs
+++ b/Lite/Services/RemoteCollectorService.cs
@@ -120,6 +120,11 @@ public RemoteCollectorService(
     /// </summary>
     public Task SeedDeltaCacheAsync() => _deltaCalculator.SeedFromDatabaseAsync(_duckDb);
 
+    /// <summary>
+    /// Runs a manual DuckDB WAL checkpoint during idle time between collection cycles.
+    /// </summary>
+    public Task CheckpointAsync() => _duckDb.CheckpointAsync();
+
     /// <summary>
     /// Gets a summary of collector health. When serverId is provided, filters to that server only.
     /// </summary>
@@ -201,8 +206,8 @@ public async Task RunDueCollectorsAsync(CancellationToken cancellationToken = de
             return;
         }
 
-        var tasks = new List<Task>();
         int skippedOffline = 0;
+        var onlineServers = new List<ServerConnection>();
 
         foreach (var server in enabledServers)
         {
@@ -213,17 +218,41 @@ public async Task RunDueCollectorsAsync(CancellationToken cancellationToken = de
                 _logger?.LogDebug("Skipping offline server '{Server}'", server.DisplayName);
                 continue;
             }
+            onlineServers.Add(server);
+        }
 
+        _logger?.LogInformation("Running {CollectorCount} collectors for {OnlineCount}/{TotalCount} servers ({SkippedCount} offline, skipped)",
+            dueCollectors.Count, onlineServers.Count, enabledServers.Count, skippedOffline);
+
+        /* Run servers in parallel, but collectors within each server sequentially.
+           DuckDB is single-writer; running all collectors in parallel causes spin-wait
+           contention (50%+ CPU, multi-second stalls). Sequential per-server eliminates
+           this while still allowing multi-server parallelism. */
+        var serverTasks = onlineServers.Select(server => Task.Run(async () =>
+        {
             foreach (var collector in dueCollectors)
             {
-                tasks.Add(RunCollectorAsync(server, collector.Name, cancellationToken));
+                await RunCollectorAsync(server, collector.Name, cancellationToken);
             }
-        }
+        }, cancellationToken));
 
-        _logger?.LogInformation("Running {CollectorCount} collectors for {OnlineCount}/{TotalCount} servers ({SkippedCount} offline, skipped)",
-            dueCollectors.Count, enabledServers.Count - skippedOffline, enabledServers.Count, skippedOffline);
+        await Task.WhenAll(serverTasks);
 
-        await Task.WhenAll(tasks);
+        /* 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. */
+        try
+        {
+            using var conn = _duckDb.CreateConnection();
+            await conn.OpenAsync(cancellationToken);
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = "CHECKPOINT";
+            await cmd.ExecuteNonQueryAsync(cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            _logger?.LogDebug(ex, "Post-collection checkpoint failed (non-critical)");
+        }
     }
 
     /// <summary>
diff --git a/install/02_create_tables.sql b/install/02_create_tables.sql
index e25923e3..c053fcab 100644
--- a/install/02_create_tables.sql
+++ b/install/02_create_tables.sql
@@ -194,6 +194,9 @@ BEGIN
         physical_memory_in_use_mb decimal(19,2) NOT NULL,
         available_physical_memory_mb decimal(19,2) NOT NULL,
         memory_utilization_percentage integer NOT NULL,
+        /*Server and target memory*/
+        total_physical_memory_mb decimal(19,2) NULL,
+        committed_target_memory_mb decimal(19,2) NULL,
         /*Pressure warnings*/
         buffer_pool_pressure_warning bit NOT NULL DEFAULT 0,
         plan_cache_pressure_warning bit NOT NULL DEFAULT 0,
@@ -219,6 +222,19 @@ BEGIN
     PRINT 'Created collect.memory_stats table';
 END;
 
+/*Add columns for existing installs*/
+IF NOT EXISTS (SELECT 1 FROM sys.columns WHERE object_id = OBJECT_ID(N'collect.memory_stats') AND name = N'total_physical_memory_mb')
+BEGIN
+    ALTER TABLE collect.memory_stats ADD total_physical_memory_mb decimal(19,2) NULL;
+    PRINT 'Added total_physical_memory_mb to collect.memory_stats';
+END;
+
+IF NOT EXISTS (SELECT 1 FROM sys.columns WHERE object_id = OBJECT_ID(N'collect.memory_stats') AND name = N'committed_target_memory_mb')
+BEGIN
+    ALTER TABLE collect.memory_stats ADD committed_target_memory_mb decimal(19,2) NULL;
+    PRINT 'Added committed_target_memory_mb to collect.memory_stats';
+END;
+
 /*
 4. I/O Performance - handled by sp_PressureDetector
 NOTE: I/O metrics are collected by sp_PressureDetector into collect.PressureDetector_FileMetrics
diff --git a/install/06_ensure_collection_table.sql b/install/06_ensure_collection_table.sql
index f5e23e73..0b7a9407 100644
--- a/install/06_ensure_collection_table.sql
+++ b/install/06_ensure_collection_table.sql
@@ -294,6 +294,9 @@ BEGIN
         physical_memory_in_use_mb decimal(19,2) NOT NULL,
         available_physical_memory_mb decimal(19,2) NOT NULL,
         memory_utilization_percentage integer NOT NULL,
+        /*Server and target memory*/
+        total_physical_memory_mb decimal(19,2) NULL,
+        committed_target_memory_mb decimal(19,2) NULL,
         /*Pressure warnings*/
         buffer_pool_pressure_warning bit NOT NULL DEFAULT 0,
         plan_cache_pressure_warning bit NOT NULL DEFAULT 0,
@@ -307,12 +310,12 @@ BEGIN
         (
             plan_cache_mb * 100.0 /
               NULLIF(total_memory_mb, 0)
-        ),        
-        CONSTRAINT 
-            PK_memory_stats 
-        PRIMARY KEY CLUSTERED 
-            (collection_time, collection_id) 
-        WITH 
+        ),
+        CONSTRAINT
+            PK_memory_stats
+        PRIMARY KEY CLUSTERED
+            (collection_time, collection_id)
+        WITH
             (DATA_COMPRESSION = PAGE)
     );
         END;
diff --git a/install/14_collect_memory_stats.sql b/install/14_collect_memory_stats.sql
index d0f5bd48..a1ebcde5 100644
--- a/install/14_collect_memory_stats.sql
+++ b/install/14_collect_memory_stats.sql
@@ -169,8 +169,15 @@ BEGIN
         system_memory AS
         (
             SELECT
-                available_physical_memory_mb = sm.available_physical_memory_kb / 1024.0
+                available_physical_memory_mb = sm.available_physical_memory_kb / 1024.0,
+                total_physical_memory_mb = sm.total_physical_memory_kb / 1024.0
             FROM sys.dm_os_sys_memory AS sm
+        ),
+        system_info AS
+        (
+            SELECT
+                committed_target_memory_mb = si.committed_target_kb / 1024.0
+            FROM sys.dm_os_sys_info AS si
         )
         INSERT INTO
             collect.memory_stats
@@ -182,6 +189,8 @@ BEGIN
             physical_memory_in_use_mb,
             available_physical_memory_mb,
             memory_utilization_percentage,
+            total_physical_memory_mb,
+            committed_target_memory_mb,
             buffer_pool_pressure_warning,
             plan_cache_pressure_warning
         )
@@ -193,6 +202,8 @@ BEGIN
             physical_memory_in_use_mb = pm.physical_memory_in_use_mb,
             available_physical_memory_mb = sm.available_physical_memory_mb,
             memory_utilization_percentage = pm.memory_utilization_percentage,
+            total_physical_memory_mb = sm.total_physical_memory_mb,
+            committed_target_memory_mb = si.committed_target_memory_mb,
             buffer_pool_pressure_warning =
                 CASE
                     WHEN @previous_buffer_pool_mb IS NOT NULL
@@ -210,6 +221,7 @@ BEGIN
         FROM memory_clerks AS mc
         CROSS JOIN process_memory AS pm
         CROSS JOIN system_memory AS sm
+        CROSS JOIN system_info AS si
         OPTION(RECOMPILE);
         
         SET @rows_collected = ROWCOUNT_BIG();
diff --git a/install/25_process_deadlock_xml.sql b/install/25_process_deadlock_xml.sql
index b7e75850..74067fdf 100644
--- a/install/25_process_deadlock_xml.sql
+++ b/install/25_process_deadlock_xml.sql
@@ -55,7 +55,10 @@ BEGIN
         @error_number integer,
         @blitzlock_database sysname = NULL,
         @sql nvarchar(max) = N'',
-        @debug_msg nvarchar(500) = N'';
+        @debug_msg nvarchar(500) = N'',
+        @utc_offset_minutes integer = DATEDIFF(MINUTE, SYSUTCDATETIME(), SYSDATETIME()),
+        @start_date_local datetime2(7) = NULL,
+        @end_date_local datetime2(7) = NULL;
 
     BEGIN TRY
         BEGIN TRANSACTION;
@@ -142,16 +145,33 @@ BEGIN
                 END;
             END;
 
+            /*
+            Convert UTC dates to local time for sp_BlitzLock and comparison
+            with collect.deadlocks.event_date (which sp_BlitzLock stores in local time).
+            event_time in collect.deadlock_xml stores UTC (from XE timestamps).
+            sp_BlitzLock converts @StartDate/@EndDate from local time to UTC internally.
+            */
+            SELECT
+                @start_date_local = DATEADD(MINUTE, @utc_offset_minutes, @start_date),
+                @end_date_local = DATEADD(MINUTE, @utc_offset_minutes, @end_date);
+
+            IF @debug = 1
+            BEGIN
+                SET @debug_msg = N'UTC offset: ' + CAST(@utc_offset_minutes AS nvarchar(10)) + N' minutes. Local dates: ' + ISNULL(CONVERT(nvarchar(30), @start_date_local, 121), N'NULL') + N' to ' + ISNULL(CONVERT(nvarchar(30), @end_date_local, 121), N'NULL');
+                RAISERROR(@debug_msg, 0, 1) WITH NOWAIT;
+            END;
+
             /*
             Delete existing parsed deadlocks for the time range to prevent duplicates
             sp_BlitzLock will re-insert fresh parsed data
+            Uses local-time dates because sp_BlitzLock stores event_date in local time
             */
             IF @start_date IS NOT NULL AND @end_date IS NOT NULL
             BEGIN
                 DELETE d
                 FROM collect.deadlocks AS d
-                WHERE d.event_date >= @start_date
-                AND   d.event_date <= @end_date;
+                WHERE d.event_date >= @start_date_local
+                AND   d.event_date <= @end_date_local;
 
                 SELECT
                     @rows_deleted = ROWCOUNT_BIG();
@@ -175,8 +195,8 @@ BEGIN
                 @TargetTableName = N''deadlock_xml'',
                 @TargetColumnName = N''deadlock_xml'',
                 @TargetTimestampColumnName = N''event_time'',
-                @StartDate = @start_date,
-                @EndDate = @end_date,
+                @StartDate = @start_date_local,
+                @EndDate = @end_date_local,
                 @OutputDatabaseName = N''PerformanceMonitor'',
                 @OutputSchemaName = N''collect'',
                 @OutputTableName = N''deadlocks'',
@@ -184,20 +204,21 @@ BEGIN
 
             EXECUTE sys.sp_executesql
                 @sql,
-                N'@start_date datetime2(7), @end_date datetime2(7), @debug bit',
-                @start_date = @start_date,
-                @end_date = @end_date,
+                N'@start_date_local datetime2(7), @end_date_local datetime2(7), @debug bit',
+                @start_date_local = @start_date_local,
+                @end_date_local = @end_date_local,
                 @debug = @debug;
 
             /*
             Verify sp_BlitzLock produced parsed results before marking rows as processed
             If no results were inserted, leave rows unprocessed so they are retried next run
+            Uses local-time dates because sp_BlitzLock stores event_date in local time
             */
             SELECT
                 @rows_parsed = COUNT_BIG(*)
             FROM collect.deadlocks AS d
-            WHERE d.event_date >= @start_date
-            AND   d.event_date <= @end_date
+            WHERE d.event_date >= @start_date_local
+            AND   d.event_date <= @end_date_local
             OPTION(RECOMPILE);
 
             IF @rows_parsed > 0
diff --git a/install/47_create_reporting_views.sql b/install/47_create_reporting_views.sql
index 6cef9387..016e64ad 100644
--- a/install/47_create_reporting_views.sql
+++ b/install/47_create_reporting_views.sql
@@ -144,7 +144,7 @@ WITH
     WHERE ws.collection_time >= DATEADD(HOUR, -1, SYSDATETIME())
     AND   ws.wait_time_ms_delta > 0
 )
-SELECT TOP (20)
+SELECT TOP (50)
     wait_type = rw.wait_type,
     wait_time_ms = rw.wait_time_ms_delta,
     wait_time_sec = rw.wait_time_ms_delta / 1000.0,
diff --git a/upgrades/1.2.0-to-1.3.0/01_add_memory_stats_columns.sql b/upgrades/1.2.0-to-1.3.0/01_add_memory_stats_columns.sql
new file mode 100644
index 00000000..d3d79c64
--- /dev/null
+++ b/upgrades/1.2.0-to-1.3.0/01_add_memory_stats_columns.sql
@@ -0,0 +1,57 @@
+/*
+Copyright 2026 Darling Data, LLC
+https://www.erikdarling.com/
+
+Upgrade from 1.2.0 to 1.3.0
+Adds total_physical_memory_mb and committed_target_memory_mb to collect.memory_stats
+*/
+
+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
+
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_stats')
+    AND   name = N'total_physical_memory_mb'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_stats
+    ADD
+        total_physical_memory_mb decimal(19,2) NULL;
+
+    PRINT 'Added total_physical_memory_mb to collect.memory_stats';
+END;
+GO
+
+IF NOT EXISTS
+(
+    SELECT
+        1/0
+    FROM sys.columns
+    WHERE object_id = OBJECT_ID(N'collect.memory_stats')
+    AND   name = N'committed_target_memory_mb'
+)
+BEGIN
+    ALTER TABLE
+        collect.memory_stats
+    ADD
+        committed_target_memory_mb decimal(19,2) NULL;
+
+    PRINT 'Added committed_target_memory_mb to collect.memory_stats';
+END;
+GO
diff --git a/upgrades/1.2.0-to-1.3.0/upgrade.txt b/upgrades/1.2.0-to-1.3.0/upgrade.txt
new file mode 100644
index 00000000..6607e7f4
--- /dev/null
+++ b/upgrades/1.2.0-to-1.3.0/upgrade.txt
@@ -0,0 +1 @@
+01_add_memory_stats_columns.sql
diff --git a/upgrades/README.md b/upgrades/README.md
index 5ac8f212..fcf28827 100644
--- a/upgrades/README.md
+++ b/upgrades/README.md
@@ -70,5 +70,7 @@ GO
 
 - **1.0.0**: Initial release
 - **1.1.0**: Remove invalid query_hash column from trace_analysis table; fix trace_analysis_collector to properly query sys.traces for file paths; add PerformanceMonitor database exclusion filter to trace; make trace START action idempotent
+- **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
 
 Future upgrade folders will be added here as new versions are released.