diff --git a/Dashboard/Controls/AlertsHistoryContent.xaml.cs b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
index 132cb1d8..ef85d722 100644
--- a/Dashboard/Controls/AlertsHistoryContent.xaml.cs
+++ b/Dashboard/Controls/AlertsHistoryContent.xaml.cs
@@ -373,7 +373,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     var sb = new StringBuilder();
                     var headers = dataGrid.Columns
                         .OfType<DataGridBoundColumn>()
-                        .Select(c => TabHelpers.GetColumnHeader(c))
+                        .Select(c => Helpers.DataGridClipboardBehavior.GetHeaderText(c))
                         .ToList();
                     sb.AppendLine(string.Join("\t", headers));
 
@@ -406,7 +406,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             var sb = new StringBuilder();
                             var headers = dataGrid.Columns
                                 .OfType<DataGridBoundColumn>()
-                                .Select(c => TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(c)))
+                                .Select(c => TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(c)))
                                 .ToList();
                             sb.AppendLine(string.Join(",", headers));
 
diff --git a/Dashboard/Controls/ConfigChangesContent.xaml b/Dashboard/Controls/ConfigChangesContent.xaml
new file mode 100644
index 00000000..e5aeb648
--- /dev/null
+++ b/Dashboard/Controls/ConfigChangesContent.xaml
@@ -0,0 +1,282 @@
+<UserControl x:Class="PerformanceMonitorDashboard.Controls.ConfigChangesContent"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800"
+             Loaded="OnLoaded">
+    <TabControl>
+        <!-- Server Configuration Changes Sub-Tab -->
+        <TabItem Header="Server Config Changes">
+            <Grid>
+            <DataGrid x:Name="ServerConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ConfigurationName}" Width="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ConfigurationName" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Configuration" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding OldValueConfigured}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Old Configured" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewValueConfigured}" Width="110">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New Configured" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding OldValueInUse}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Old In Use" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewValueInUse}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New In Use" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding RequiresRestart}" Width="80">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Restart?" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="ServerConfigChangesRestartFilterCombo" Width="70" Height="22" FontSize="11"
+                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="RequiresRestart">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsDynamic}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Dynamic" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="ServerConfigChangesDynamicFilterCombo" Width="60" Height="22" FontSize="11"
+                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsDynamic">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsAdvanced}" Width="70">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Advanced" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="ServerConfigChangesAdvancedFilterCombo" Width="60" Height="22" FontSize="11"
+                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsAdvanced">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="250">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Description}" Width="*">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Description" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="ServerConfigChangesNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+
+        <!-- Database Configuration Changes Sub-Tab -->
+        <TabItem Header="Database Config Changes">
+            <Grid>
+            <DataGrid x:Name="DatabaseConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingType}" Width="120">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingType" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Type" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding SettingName}" Width="200">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Setting Name" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding OldValue}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Old Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewValue}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New Value" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="DatabaseConfigChangesNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+
+        <!-- Trace Flag Changes Sub-Tab -->
+        <TabItem Header="Trace Flag Changes">
+            <Grid>
+            <DataGrid x:Name="TraceFlagChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
+                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
+                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding TraceFlag}" Width="90">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Trace Flag" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding PreviousStatus}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PreviousStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Previous Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding NewStatus}" Width="100">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="New Status" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Binding="{Binding Scope}" Width="80">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Scope" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Scope" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsGlobal}" Width="80">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Global" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="TraceFlagChangesGlobalFilterCombo" Width="70" Height="22" FontSize="11"
+                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsGlobal">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridCheckBoxColumn Binding="{Binding IsSession}" Width="80">
+                        <DataGridCheckBoxColumn.Header>
+                            <StackPanel>
+                                <TextBlock Text="Session" FontWeight="Bold" Margin="0,0,0,2"/>
+                                <ComboBox x:Name="TraceFlagChangesSessionFilterCombo" Width="70" Height="22" FontSize="11"
+                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsSession">
+                                    <ComboBoxItem Content="All" IsSelected="True"/>
+                                    <ComboBoxItem Content="True"/>
+                                    <ComboBoxItem Content="False"/>
+                                </ComboBox>
+                            </StackPanel>
+                        </DataGridCheckBoxColumn.Header>
+                    </DataGridCheckBoxColumn>
+                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
+                        <DataGridTextColumn.Header>
+                            <StackPanel Orientation="Horizontal">
+                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
+                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
+                            </StackPanel>
+                        </DataGridTextColumn.Header>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBlock x:Name="TraceFlagChangesNoDataMessage" Style="{DynamicResource NoDataMessage}"/>
+            </Grid>
+        </TabItem>
+    </TabControl>
+</UserControl>
diff --git a/Dashboard/Controls/ConfigChangesContent.xaml.cs b/Dashboard/Controls/ConfigChangesContent.xaml.cs
new file mode 100644
index 00000000..9e9878b4
--- /dev/null
+++ b/Dashboard/Controls/ConfigChangesContent.xaml.cs
@@ -0,0 +1,384 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using PerformanceMonitorDashboard.Helpers;
+using PerformanceMonitorDashboard.Models;
+using PerformanceMonitorDashboard.Services;
+
+namespace PerformanceMonitorDashboard.Controls
+{
+    public partial class ConfigChangesContent : UserControl
+    {
+        private DatabaseService? _databaseService;
+
+        private int _hoursBack = 24;
+        private DateTime? _fromDate;
+        private DateTime? _toDate;
+
+        // Popup filter state
+        private Popup? _filterPopup;
+        private ColumnFilterPopup? _filterPopupContent;
+        private string? _activeFilterGrid;
+
+        private readonly Dictionary<string, ColumnFilterState> _serverConfigChangesFilters = new();
+        private List<ServerConfigChangeItem>? _serverConfigChangesUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _dbConfigChangesFilters = new();
+        private List<DatabaseConfigChangeItem>? _dbConfigChangesUnfilteredData;
+
+        private readonly Dictionary<string, ColumnFilterState> _traceFlagChangesFilters = new();
+        private List<TraceFlagChangeItem>? _traceFlagChangesUnfilteredData;
+
+        public ConfigChangesContent()
+        {
+            InitializeComponent();
+        }
+
+        public void Initialize(DatabaseService databaseService)
+        {
+            _databaseService = databaseService;
+        }
+
+        public void SetTimeRange(int hoursBack, DateTime? fromDate, DateTime? toDate)
+        {
+            _hoursBack = hoursBack;
+            _fromDate = fromDate;
+            _toDate = toDate;
+        }
+
+        public async Task RefreshAllDataAsync()
+        {
+            if (_databaseService == null) return;
+
+            await Task.WhenAll(
+                RefreshServerConfigChangesAsync(),
+                RefreshDbConfigChangesAsync(),
+                RefreshTraceFlagChangesAsync()
+            );
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            TabHelpers.AutoSizeColumnMinWidths(ServerConfigChangesDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(DatabaseConfigChangesDataGrid);
+            TabHelpers.AutoSizeColumnMinWidths(TraceFlagChangesDataGrid);
+            TabHelpers.FreezeColumns(ServerConfigChangesDataGrid, 1);
+            TabHelpers.FreezeColumns(DatabaseConfigChangesDataGrid, 2);
+            TabHelpers.FreezeColumns(TraceFlagChangesDataGrid, 1);
+        }
+
+        #region Server Configuration Changes
+
+        private async Task RefreshServerConfigChangesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetServerConfigChangesAsync(_hoursBack, _fromDate, _toDate);
+                _serverConfigChangesUnfilteredData = data;
+                _serverConfigChangesFilters.Clear();
+                ServerConfigChangesDataGrid.ItemsSource = data;
+                ServerConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading server configuration changes: {ex.Message}");
+            }
+        }
+
+        private void ServerConfigChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            ApplyServerConfigChangesFilters();
+        }
+
+        private void ApplyServerConfigChangesFilters()
+        {
+            if (_serverConfigChangesUnfilteredData == null) return;
+
+            var restartFilter = (ServerConfigChangesRestartFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+            var dynamicFilter = (ServerConfigChangesDynamicFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+            var advancedFilter = (ServerConfigChangesAdvancedFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+
+            if (_serverConfigChangesFilters.Count == 0 && restartFilter == "All" && dynamicFilter == "All" && advancedFilter == "All")
+            {
+                ServerConfigChangesDataGrid.ItemsSource = _serverConfigChangesUnfilteredData;
+                return;
+            }
+
+            var filteredData = _serverConfigChangesUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _serverConfigChangesFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+
+                if (restartFilter != "All" && restartFilter != null)
+                {
+                    bool expected = restartFilter == "True";
+                    if (item.RequiresRestart != expected) return false;
+                }
+                if (dynamicFilter != "All" && dynamicFilter != null)
+                {
+                    bool expected = dynamicFilter == "True";
+                    if (item.IsDynamic != expected) return false;
+                }
+                if (advancedFilter != "All" && advancedFilter != null)
+                {
+                    bool expected = advancedFilter == "True";
+                    if (item.IsAdvanced != expected) return false;
+                }
+
+                return true;
+            }).ToList();
+
+            ServerConfigChangesDataGrid.ItemsSource = filteredData;
+        }
+
+        #endregion
+
+        #region Database Configuration Changes
+
+        private async Task RefreshDbConfigChangesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetDatabaseConfigChangesAsync(_hoursBack, _fromDate, _toDate);
+                _dbConfigChangesUnfilteredData = data;
+                _dbConfigChangesFilters.Clear();
+                DatabaseConfigChangesDataGrid.ItemsSource = data;
+                DatabaseConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading database configuration changes: {ex.Message}");
+            }
+        }
+
+        private void ApplyDbConfigChangesFilters()
+        {
+            if (_dbConfigChangesUnfilteredData == null) return;
+
+            if (_dbConfigChangesFilters.Count == 0)
+            {
+                DatabaseConfigChangesDataGrid.ItemsSource = _dbConfigChangesUnfilteredData;
+                return;
+            }
+
+            var filteredData = _dbConfigChangesUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _dbConfigChangesFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+                return true;
+            }).ToList();
+
+            DatabaseConfigChangesDataGrid.ItemsSource = filteredData;
+        }
+
+        #endregion
+
+        #region Trace Flag Changes
+
+        private async Task RefreshTraceFlagChangesAsync()
+        {
+            if (_databaseService == null) return;
+
+            try
+            {
+                var data = await _databaseService.GetTraceFlagChangesAsync(_hoursBack, _fromDate, _toDate);
+                _traceFlagChangesUnfilteredData = data;
+                _traceFlagChangesFilters.Clear();
+                TraceFlagChangesDataGrid.ItemsSource = data;
+                TraceFlagChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
+                UpdateFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error($"Error loading trace flag changes: {ex.Message}");
+            }
+        }
+
+        private void TraceFlagChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
+        {
+            ApplyTraceFlagChangesFilters();
+        }
+
+        private void ApplyTraceFlagChangesFilters()
+        {
+            if (_traceFlagChangesUnfilteredData == null) return;
+
+            var globalFilter = (TraceFlagChangesGlobalFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+            var sessionFilter = (TraceFlagChangesSessionFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
+
+            if (_traceFlagChangesFilters.Count == 0 && globalFilter == "All" && sessionFilter == "All")
+            {
+                TraceFlagChangesDataGrid.ItemsSource = _traceFlagChangesUnfilteredData;
+                return;
+            }
+
+            var filteredData = _traceFlagChangesUnfilteredData.Where(item =>
+            {
+                foreach (var filter in _traceFlagChangesFilters.Values)
+                {
+                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
+                        return false;
+                }
+
+                if (globalFilter != "All" && globalFilter != null)
+                {
+                    bool expected = globalFilter == "True";
+                    if (item.IsGlobal != expected) return false;
+                }
+                if (sessionFilter != "All" && sessionFilter != null)
+                {
+                    bool expected = sessionFilter == "True";
+                    if (item.IsSession != expected) return false;
+                }
+
+                return true;
+            }).ToList();
+
+            TraceFlagChangesDataGrid.ItemsSource = filteredData;
+        }
+
+        #endregion
+
+        #region Popup Filter Infrastructure
+
+        private void ServerConfigChangesFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "ServerConfigChanges";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _serverConfigChangesFilters);
+        }
+
+        private void DbConfigChangesFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "DbConfigChanges";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _dbConfigChangesFilters);
+        }
+
+        private void TraceFlagChangesFilter_Click(object sender, RoutedEventArgs e)
+        {
+            _activeFilterGrid = "TraceFlagChanges";
+            if (sender is Button button && button.Tag is string columnName)
+                ShowFilterPopup(button, columnName, _traceFlagChangesFilters);
+        }
+
+        private void ShowFilterPopup(Button button, string columnName, Dictionary<string, ColumnFilterState> filters)
+        {
+            if (_filterPopup == null)
+            {
+                _filterPopupContent = new ColumnFilterPopup();
+                _filterPopupContent.FilterApplied += FilterPopup_FilterApplied;
+                _filterPopupContent.FilterCleared += FilterPopup_FilterCleared;
+
+                _filterPopup = new Popup
+                {
+                    Child = _filterPopupContent,
+                    StaysOpen = false,
+                    Placement = PlacementMode.Bottom,
+                    AllowsTransparency = true
+                };
+            }
+
+            filters.TryGetValue(columnName, out var existingFilter);
+            _filterPopupContent!.Initialize(columnName, existingFilter);
+            _filterPopup.PlacementTarget = button;
+            _filterPopup.IsOpen = true;
+        }
+
+        private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+
+            switch (_activeFilterGrid)
+            {
+                case "ServerConfigChanges":
+                    if (e.FilterState.IsActive)
+                        _serverConfigChangesFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _serverConfigChangesFilters.Remove(e.FilterState.ColumnName);
+                    ApplyServerConfigChangesFilters();
+                    UpdateFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
+                    break;
+
+                case "DbConfigChanges":
+                    if (e.FilterState.IsActive)
+                        _dbConfigChangesFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _dbConfigChangesFilters.Remove(e.FilterState.ColumnName);
+                    ApplyDbConfigChangesFilters();
+                    UpdateFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
+                    break;
+
+                case "TraceFlagChanges":
+                    if (e.FilterState.IsActive)
+                        _traceFlagChangesFilters[e.FilterState.ColumnName] = e.FilterState;
+                    else
+                        _traceFlagChangesFilters.Remove(e.FilterState.ColumnName);
+                    ApplyTraceFlagChangesFilters();
+                    UpdateFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
+                    break;
+            }
+        }
+
+        private void FilterPopup_FilterCleared(object? sender, EventArgs e)
+        {
+            if (_filterPopup != null)
+                _filterPopup.IsOpen = false;
+        }
+
+        private void UpdateFilterButtonStyles(DataGrid grid, Dictionary<string, ColumnFilterState> filters)
+        {
+            foreach (var column in grid.Columns)
+            {
+                if (column.Header is StackPanel stackPanel)
+                {
+                    var filterButton = stackPanel.Children.OfType<Button>().FirstOrDefault();
+                    if (filterButton != null && filterButton.Tag is string columnName)
+                    {
+                        bool hasActiveFilter = filters.TryGetValue(columnName, out var filter) && filter.IsActive;
+
+                        var textBlock = new TextBlock
+                        {
+                            Text = "\uE71C",
+                            FontFamily = new System.Windows.Media.FontFamily("Segoe MDL2 Assets"),
+                            Foreground = hasActiveFilter
+                                ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xD7, 0x00))
+                                : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0xFF, 0xFF, 0xFF))
+                        };
+                        filterButton.Content = textBlock;
+                        filterButton.ToolTip = hasActiveFilter && filter != null
+                            ? $"Filter: {filter.DisplayText}\n(Click to modify)"
+                            : "Click to filter";
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Dashboard/Controls/CriticalIssuesContent.xaml.cs b/Dashboard/Controls/CriticalIssuesContent.xaml.cs
index cecc99c2..2fa6859e 100644
--- a/Dashboard/Controls/CriticalIssuesContent.xaml.cs
+++ b/Dashboard/Controls/CriticalIssuesContent.xaml.cs
@@ -308,7 +308,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -351,7 +351,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                                 }
                             }
                             sb.AppendLine(string.Join(",", headers));
diff --git a/Dashboard/Controls/DailySummaryContent.xaml.cs b/Dashboard/Controls/DailySummaryContent.xaml.cs
index e7d77b5b..bbfa4824 100644
--- a/Dashboard/Controls/DailySummaryContent.xaml.cs
+++ b/Dashboard/Controls/DailySummaryContent.xaml.cs
@@ -385,7 +385,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -428,7 +428,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                                 }
                             }
                             sb.AppendLine(string.Join(",", headers));
diff --git a/Dashboard/Controls/MemoryContent.xaml.cs b/Dashboard/Controls/MemoryContent.xaml.cs
index 5ce7ee3b..56a8b30a 100644
--- a/Dashboard/Controls/MemoryContent.xaml.cs
+++ b/Dashboard/Controls/MemoryContent.xaml.cs
@@ -928,7 +928,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -974,7 +974,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                                 }
                             }
                             sb.AppendLine(string.Join(",", headers));
diff --git a/Dashboard/Controls/QueryPerformanceContent.xaml.cs b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
index 59d59287..05de89c9 100644
--- a/Dashboard/Controls/QueryPerformanceContent.xaml.cs
+++ b/Dashboard/Controls/QueryPerformanceContent.xaml.cs
@@ -1089,7 +1089,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn)
                         {
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("\t", headers));
@@ -1192,7 +1192,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                                 }
                             }
                             sb.AppendLine(string.Join(",", headers));
diff --git a/Dashboard/Controls/ResourceMetricsContent.xaml.cs b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
index 3665466f..6391b96e 100644
--- a/Dashboard/Controls/ResourceMetricsContent.xaml.cs
+++ b/Dashboard/Controls/ResourceMetricsContent.xaml.cs
@@ -1289,7 +1289,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                 {
                     var sb = new StringBuilder();
 
-                    var headers = grid.Columns.Select(c => c.Header?.ToString() ?? string.Empty);
+                    var headers = grid.Columns.Select(c => Helpers.DataGridClipboardBehavior.GetHeaderText(c));
                     sb.AppendLine(string.Join("\t", headers));
 
                     foreach (var item in grid.Items)
@@ -1336,7 +1336,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                         {
                             var sb = new StringBuilder();
 
-                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(c.Header?.ToString() ?? string.Empty));
+                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(c)));
                             sb.AppendLine(string.Join(",", headers));
 
                             foreach (var item in grid.Items)
diff --git a/Dashboard/Controls/SystemEventsContent.xaml.cs b/Dashboard/Controls/SystemEventsContent.xaml.cs
index e17a5ee6..6ecbf019 100644
--- a/Dashboard/Controls/SystemEventsContent.xaml.cs
+++ b/Dashboard/Controls/SystemEventsContent.xaml.cs
@@ -2120,7 +2120,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     var sb = new StringBuilder();
 
                     // Header row
-                    var headers = grid.Columns.Select(c => c.Header?.ToString() ?? string.Empty);
+                    var headers = grid.Columns.Select(c => Helpers.DataGridClipboardBehavior.GetHeaderText(c));
                     sb.AppendLine(string.Join("\t", headers));
 
                     // Data rows
@@ -2169,7 +2169,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             var sb = new StringBuilder();
 
                             // Header row
-                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(c.Header?.ToString() ?? string.Empty));
+                            var headers = grid.Columns.Select(c => TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(c)));
                             sb.AppendLine(string.Join(",", headers));
 
                             // Data rows
diff --git a/Dashboard/Helpers/DataGridClipboardBehavior.cs b/Dashboard/Helpers/DataGridClipboardBehavior.cs
new file mode 100644
index 00000000..4c491ee5
--- /dev/null
+++ b/Dashboard/Helpers/DataGridClipboardBehavior.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace PerformanceMonitorDashboard.Helpers;
+
+/// <summary>
+/// Attached behavior that fixes DataGrid clipboard copy when column headers
+/// use StackPanel (e.g. filter button + text). Without this, copied headers
+/// show "System.Windows.Controls.StackPanel" instead of the column name.
+/// </summary>
+public static class DataGridClipboardBehavior
+{
+    public static readonly DependencyProperty FixHeaderCopyProperty =
+        DependencyProperty.RegisterAttached(
+            "FixHeaderCopy",
+            typeof(bool),
+            typeof(DataGridClipboardBehavior),
+            new PropertyMetadata(false, OnFixHeaderCopyChanged));
+
+    public static bool GetFixHeaderCopy(DependencyObject obj) => (bool)obj.GetValue(FixHeaderCopyProperty);
+    public static void SetFixHeaderCopy(DependencyObject obj, bool value) => obj.SetValue(FixHeaderCopyProperty, value);
+
+    private static void OnFixHeaderCopyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DataGrid grid && (bool)e.NewValue)
+        {
+            grid.CopyingRowClipboardContent += FixHeaderCopy;
+        }
+    }
+
+    /// <summary>
+    /// Extracts the display text from a DataGrid column header.
+    /// Handles StackPanel headers (filter button + TextBlock) by returning the TextBlock text.
+    /// </summary>
+    public static string GetHeaderText(DataGridColumn column)
+    {
+        if (column.Header is StackPanel sp)
+        {
+            var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+            if (tb != null) return tb.Text;
+        }
+        return column.Header?.ToString() ?? "";
+    }
+
+    /// <summary>
+    /// Event handler that can be wired directly to DataGrid.CopyingRowClipboardContent.
+    /// </summary>
+    public static void FixHeaderCopy(object? sender, DataGridRowClipboardEventArgs e)
+    {
+        if (!e.IsColumnHeadersRow) return;
+
+        for (int i = 0; i < e.ClipboardRowContent.Count; i++)
+        {
+            var cell = e.ClipboardRowContent[i];
+            if (cell.Column?.Header is StackPanel sp)
+            {
+                var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+                if (tb != null)
+                {
+                    e.ClipboardRowContent[i] = new DataGridClipboardCellContent(cell.Item, cell.Column, tb.Text);
+                }
+            }
+        }
+    }
+}
diff --git a/Dashboard/MainWindow.xaml.cs b/Dashboard/MainWindow.xaml.cs
index 3afcf7e6..4153477b 100644
--- a/Dashboard/MainWindow.xaml.cs
+++ b/Dashboard/MainWindow.xaml.cs
@@ -772,20 +772,34 @@ private void EditServer_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void RemoveServer_Click(object sender, RoutedEventArgs e)
+        private async void RemoveServer_Click(object sender, RoutedEventArgs e)
         {
             if (ServerListView.SelectedItem is ServerListItem item)
             {
                 var server = item.Server;
-                var result = MessageBox.Show(
-                    $"Are you sure you want to remove server '{server.DisplayName}'?\n\nThis action cannot be undone.",
-                    "Confirm Remove Server",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Warning
-                );
-
-                if (result == MessageBoxResult.Yes)
+                var dialog = new RemoveServerDialog(server.DisplayName);
+                dialog.Owner = this;
+
+                if (dialog.ShowDialog() == true)
                 {
+                    // Drop the database first if requested (before we delete credentials)
+                    if (dialog.DropDatabase)
+                    {
+                        try
+                        {
+                            await _serverManager.DropMonitorDatabaseAsync(server);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(
+                                $"Could not drop the PerformanceMonitor database on '{server.DisplayName}':\n\n{ex.Message}\n\nThe server will still be removed from the Dashboard.",
+                                "Database Drop Failed",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Warning
+                            );
+                        }
+                    }
+
                     if (_openTabs.TryGetValue(server.Id, out var tabItem))
                     {
                         _openTabs.Remove(server.Id);
diff --git a/Dashboard/ManageServersWindow.xaml.cs b/Dashboard/ManageServersWindow.xaml.cs
index 4ce1eaf1..df735ff1 100644
--- a/Dashboard/ManageServersWindow.xaml.cs
+++ b/Dashboard/ManageServersWindow.xaml.cs
@@ -139,19 +139,32 @@ private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void RemoveServer_Click(object sender, RoutedEventArgs e)
+        private async void RemoveServer_Click(object sender, RoutedEventArgs e)
         {
             if (ServersDataGrid.SelectedItem is ServerConnection server)
             {
-                var result = MessageBox.Show(
-                    $"Are you sure you want to remove server '{server.DisplayName}'?\n\nThis action cannot be undone.",
-                    "Confirm Remove Server",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Warning
-                );
+                var dialog = new RemoveServerDialog(server.DisplayName);
+                dialog.Owner = this;
 
-                if (result == MessageBoxResult.Yes)
+                if (dialog.ShowDialog() == true)
                 {
+                    if (dialog.DropDatabase)
+                    {
+                        try
+                        {
+                            await _serverManager.DropMonitorDatabaseAsync(server);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(
+                                $"Could not drop the PerformanceMonitor database on '{server.DisplayName}':\n\n{ex.Message}\n\nThe server will still be removed from the Dashboard.",
+                                "Database Drop Failed",
+                                MessageBoxButton.OK,
+                                MessageBoxImage.Warning
+                            );
+                        }
+                    }
+
                     _serverManager.DeleteServer(server.Id);
                     LoadServers();
                     ServersModified = true;
diff --git a/Dashboard/ProcedureHistoryWindow.xaml.cs b/Dashboard/ProcedureHistoryWindow.xaml.cs
index 0a193ca8..e6f9abdb 100644
--- a/Dashboard/ProcedureHistoryWindow.xaml.cs
+++ b/Dashboard/ProcedureHistoryWindow.xaml.cs
@@ -369,7 +369,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     foreach (var column in dataGrid.Columns)
                     {
                         if (column is DataGridBoundColumn)
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                     }
                     sb.AppendLine(string.Join("\t", headers));
                     foreach (var item in dataGrid.Items)
@@ -402,7 +402,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             foreach (var column in dataGrid.Columns)
                             {
                                 if (column is DataGridBoundColumn)
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                             }
                             sb.AppendLine(string.Join(",", headers));
                             foreach (var item in dataGrid.Items)
diff --git a/Dashboard/QueryExecutionHistoryWindow.xaml.cs b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
index b0479cc7..c48a56c7 100644
--- a/Dashboard/QueryExecutionHistoryWindow.xaml.cs
+++ b/Dashboard/QueryExecutionHistoryWindow.xaml.cs
@@ -421,7 +421,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     foreach (var column in dataGrid.Columns)
                     {
                         if (column is DataGridBoundColumn)
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                     }
                     sb.AppendLine(string.Join("\t", headers));
                     foreach (var item in dataGrid.Items)
@@ -454,7 +454,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             foreach (var column in dataGrid.Columns)
                             {
                                 if (column is DataGridBoundColumn)
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                             }
                             sb.AppendLine(string.Join(",", headers));
                             foreach (var item in dataGrid.Items)
diff --git a/Dashboard/QueryStatsHistoryWindow.xaml.cs b/Dashboard/QueryStatsHistoryWindow.xaml.cs
index 8ce357ff..39b5204f 100644
--- a/Dashboard/QueryStatsHistoryWindow.xaml.cs
+++ b/Dashboard/QueryStatsHistoryWindow.xaml.cs
@@ -366,7 +366,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     foreach (var column in dataGrid.Columns)
                     {
                         if (column is DataGridBoundColumn)
-                            headers.Add(TabHelpers.GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                     }
                     sb.AppendLine(string.Join("\t", headers));
                     foreach (var item in dataGrid.Items)
@@ -399,7 +399,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             foreach (var column in dataGrid.Columns)
                             {
                                 if (column is DataGridBoundColumn)
-                                    headers.Add(TabHelpers.EscapeCsvField(TabHelpers.GetColumnHeader(column)));
+                                    headers.Add(TabHelpers.EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                             }
                             sb.AppendLine(string.Join(",", headers));
                             foreach (var item in dataGrid.Items)
diff --git a/Dashboard/RemoveServerDialog.xaml b/Dashboard/RemoveServerDialog.xaml
new file mode 100644
index 00000000..5edef594
--- /dev/null
+++ b/Dashboard/RemoveServerDialog.xaml
@@ -0,0 +1,39 @@
+<Window x:Class="PerformanceMonitorDashboard.RemoveServerDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Confirm Remove Server"
+        Height="230" Width="450"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Background="{DynamicResource BackgroundBrush}">
+    <Window.Resources>
+        <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    </Window.Resources>
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Warning message -->
+        <TextBlock Grid.Row="0" x:Name="WarningText" TextWrapping="Wrap" FontSize="13" Margin="0,0,0,15"/>
+
+        <!-- Drop database checkbox -->
+        <CheckBox Grid.Row="1" x:Name="DropDatabaseCheckBox" Margin="0,0,0,5"
+                  Foreground="{DynamicResource ForegroundBrush}">
+            <TextBlock Text="Also drop the PerformanceMonitor database on this server" TextWrapping="Wrap"/>
+        </CheckBox>
+        <TextBlock Grid.Row="2" Text="Warning: all collected monitoring data on the server will be permanently deleted."
+                   FontSize="11" Foreground="{DynamicResource ErrorBrush}" Margin="20,0,0,15"
+                   TextWrapping="Wrap" Visibility="{Binding ElementName=DropDatabaseCheckBox, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}}"/>
+
+        <!-- Buttons -->
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Content="Remove" Width="80" Height="28" Margin="0,0,8,0" Click="Remove_Click"
+                    Foreground="{DynamicResource ErrorBrush}"/>
+            <Button Content="Cancel" Width="80" Height="28" Click="Cancel_Click" IsCancel="True"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Dashboard/RemoveServerDialog.xaml.cs b/Dashboard/RemoveServerDialog.xaml.cs
new file mode 100644
index 00000000..e0f93078
--- /dev/null
+++ b/Dashboard/RemoveServerDialog.xaml.cs
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Windows;
+
+namespace PerformanceMonitorDashboard
+{
+    public partial class RemoveServerDialog : Window
+    {
+        public bool DropDatabase => DropDatabaseCheckBox.IsChecked == true;
+
+        public RemoveServerDialog(string serverDisplayName)
+        {
+            InitializeComponent();
+            WarningText.Text = $"Are you sure you want to remove server '{serverDisplayName}'?\n\nThis action cannot be undone.";
+        }
+
+        private void Remove_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+    }
+}
diff --git a/Dashboard/ServerTab.xaml b/Dashboard/ServerTab.xaml
index 526137c9..fd6d96d7 100644
--- a/Dashboard/ServerTab.xaml
+++ b/Dashboard/ServerTab.xaml
@@ -234,279 +234,9 @@
                         <controls:CurrentConfigContent x:Name="CurrentConfigTab" />
                     </TabItem>
 
-                    <!-- Server Configuration Changes Sub-Tab -->
-                    <TabItem Header="Server Config Changes">
-                        <Grid>
-                        <DataGrid x:Name="ServerConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                                      RowStyle="{StaticResource DefaultRowStyle}"
-                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding ConfigurationName}" Width="200">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ConfigurationName" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Configuration" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding OldValueConfigured}" Width="110">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Old Configured" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewValueConfigured}" Width="110">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueConfigured" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New Configured" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding OldValueInUse}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Old In Use" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewValueInUse}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValueInUse" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New In Use" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding RequiresRestart}" Width="80">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Restart?" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="ServerConfigChangesRestartFilterCombo" Width="70" Height="22" FontSize="11"
-                                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="RequiresRestart">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsDynamic}" Width="70">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Dynamic" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="ServerConfigChangesDynamicFilterCombo" Width="60" Height="22" FontSize="11"
-                                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsDynamic">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsAdvanced}" Width="70">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Advanced" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="ServerConfigChangesAdvancedFilterCombo" Width="60" Height="22" FontSize="11"
-                                                          SelectionChanged="ServerConfigChangesBoolFilter_Changed" Tag="IsAdvanced">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="250">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Description}" Width="*">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Description" Click="ServerConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Setting Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="ServerConfigChangesNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
-                    </TabItem>
-
-                    <!-- Database Configuration Changes Sub-Tab -->
-                    <TabItem Header="Database Config Changes">
-                        <Grid>
-                        <DataGrid x:Name="DatabaseConfigChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                                      RowStyle="{StaticResource DefaultRowStyle}"
-                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding DatabaseName}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="DatabaseName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Database" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding SettingType}" Width="120">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingType" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Setting Type" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding SettingName}" Width="200">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="SettingName" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Setting Name" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding OldValue}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="OldValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Old Value" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewValue}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewValue" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New Value" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="DbConfigChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="DatabaseConfigChangesNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
-                    </TabItem>
-
-                    <!-- Trace Flag Changes Sub-Tab -->
-                    <TabItem Header="Trace Flag Changes">
-                        <Grid>
-                        <DataGrid x:Name="TraceFlagChangesDataGrid" AutoGenerateColumns="False" IsReadOnly="True"
-                                      RowHeight="28" GridLinesVisibility="Horizontal" CanUserResizeColumns="True"
-                                      RowStyle="{StaticResource DefaultRowStyle}"
-                                      ScrollViewer.CanContentScroll="True" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Binding="{Binding ChangeTime, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Width="150">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeTime" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Time" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding TraceFlag}" Width="90">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TraceFlag" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Trace Flag" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding PreviousStatus}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PreviousStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Previous Status" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding NewStatus}" Width="100">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="NewStatus" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="New Status" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridTextColumn Binding="{Binding Scope}" Width="80">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="Scope" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Scope" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsGlobal}" Width="80">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Global" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="TraceFlagChangesGlobalFilterCombo" Width="70" Height="22" FontSize="11"
-                                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsGlobal">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridCheckBoxColumn Binding="{Binding IsSession}" Width="80">
-                                        <DataGridCheckBoxColumn.Header>
-                                            <StackPanel>
-                                                <TextBlock Text="Session" FontWeight="Bold" Margin="0,0,0,2"/>
-                                                <ComboBox x:Name="TraceFlagChangesSessionFilterCombo" Width="70" Height="22" FontSize="11"
-                                                          SelectionChanged="TraceFlagChangesBoolFilter_Changed" Tag="IsSession">
-                                                    <ComboBoxItem Content="All" IsSelected="True"/>
-                                                    <ComboBoxItem Content="True"/>
-                                                    <ComboBoxItem Content="False"/>
-                                                </ComboBox>
-                                            </StackPanel>
-                                        </DataGridCheckBoxColumn.Header>
-                                    </DataGridCheckBoxColumn>
-                                    <DataGridTextColumn Binding="{Binding ChangeDescription}" Width="*">
-                                        <DataGridTextColumn.Header>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="ChangeDescription" Click="TraceFlagChangesFilter_Click" Margin="0,0,4,0"/>
-                                                <TextBlock Text="Change Description" FontWeight="Bold" VerticalAlignment="Center"/>
-                                            </StackPanel>
-                                        </DataGridTextColumn.Header>
-                                    </DataGridTextColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        <TextBlock x:Name="TraceFlagChangesNoDataMessage" Style="{StaticResource NoDataMessage}"/>
-                        </Grid>
+                    <!-- Configuration Changes Sub-Tab -->
+                    <TabItem Header="Configuration Changes">
+                        <controls:ConfigChangesContent x:Name="ConfigChangesTab" />
                     </TabItem>
 
                     <!-- Collection Health Sub-Tab -->
diff --git a/Dashboard/ServerTab.xaml.cs b/Dashboard/ServerTab.xaml.cs
index 5c849416..c04f0d8b 100644
--- a/Dashboard/ServerTab.xaml.cs
+++ b/Dashboard/ServerTab.xaml.cs
@@ -49,14 +49,6 @@ public partial class ServerTab : UserControl
         private bool _isRefreshing;
 
         // Filter state dictionaries for each DataGrid
-        private Dictionary<string, ColumnFilterState> _serverConfigChangesFilters = new();
-        private List<ServerConfigChangeItem>? _serverConfigChangesUnfilteredData;
-
-        private Dictionary<string, ColumnFilterState> _dbConfigChangesFilters = new();
-        private List<DatabaseConfigChangeItem>? _dbConfigChangesUnfilteredData;
-
-        private Dictionary<string, ColumnFilterState> _traceFlagChangesFilters = new();
-        private List<TraceFlagChangeItem>? _traceFlagChangesUnfilteredData;
 
         private Dictionary<string, ColumnFilterState> _collectionHealthFilters = new();
         private List<CollectionHealthItem>? _collectionHealthUnfilteredData;
@@ -122,6 +114,7 @@ public ServerTab(ServerConnection serverConnection, int utcOffsetMinutes = 0)
             CriticalIssuesTab.Initialize(_databaseService);
             DefaultTraceTab.Initialize(_databaseService);
             CurrentConfigTab.Initialize(_databaseService);
+            ConfigChangesTab.Initialize(_databaseService);
             MemoryTab.Initialize(_databaseService);
             PerformanceTab.Initialize(_databaseService, s => StatusText.Text = s);
             SystemEventsContent.Initialize(_databaseService);
@@ -154,9 +147,7 @@ private void InitializeDefaultTimeRanges()
             _blockingStatsHoursBack = defaultHours;
             // Performance tab state variables now managed by QueryPerformanceContent UserControl
             // Memory state variables now managed by MemoryContent UserControl
-            _serverConfigChangesHoursBack = defaultHours;
-            _dbConfigChangesHoursBack = defaultHours;
-            _traceFlagChangesHoursBack = defaultHours;
+            ConfigChangesTab.SetTimeRange(defaultHours, null, null);
             // _sessionStatsHoursBack and _queryPerfTrendsHoursBack now managed by QueryPerformanceContent UserControl
             // _criticalIssuesHoursBack now managed by CriticalIssuesTab UserControl
             // System Health/HealthParser state now managed by SystemEventsContent UserControl
@@ -680,17 +671,11 @@ private async void ServerTab_Loaded(object sender, RoutedEventArgs e)
             try
             {
                 // Apply minimum column widths based on header text
-                Helpers.TabHelpers.AutoSizeColumnMinWidths(ServerConfigChangesDataGrid);
-                Helpers.TabHelpers.AutoSizeColumnMinWidths(DatabaseConfigChangesDataGrid);
-                Helpers.TabHelpers.AutoSizeColumnMinWidths(TraceFlagChangesDataGrid);
                 Helpers.TabHelpers.AutoSizeColumnMinWidths(HealthDataGrid);
                 Helpers.TabHelpers.AutoSizeColumnMinWidths(BlockingEventsDataGrid);
                 Helpers.TabHelpers.AutoSizeColumnMinWidths(DeadlocksDataGrid);
 
                 // Freeze identifier columns
-                Helpers.TabHelpers.FreezeColumns(ServerConfigChangesDataGrid, 1);
-                Helpers.TabHelpers.FreezeColumns(DatabaseConfigChangesDataGrid, 2);
-                Helpers.TabHelpers.FreezeColumns(TraceFlagChangesDataGrid, 1);
                 Helpers.TabHelpers.FreezeColumns(HealthDataGrid, 1);
                 Helpers.TabHelpers.FreezeColumns(BlockingEventsDataGrid, 1);
                 Helpers.TabHelpers.FreezeColumns(DeadlocksDataGrid, 1);
@@ -1173,10 +1158,12 @@ private async Task ApplyAndRefreshCurrentTabAsync()
                         _resourceOverviewToDate = _globalToDate;
                         CriticalIssuesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         DefaultTraceTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
+                        ConfigChangesTab.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         CollectionHealth_Refresh_Click(null, new RoutedEventArgs());
                         await CriticalIssuesTab.RefreshDataAsync();
                         await DefaultTraceTab.RefreshAllDataAsync();
                         await CurrentConfigTab.RefreshAllDataAsync();
+                        await ConfigChangesTab.RefreshAllDataAsync();
                         await RefreshResourceOverviewAsync();
                         break;
 
@@ -1218,19 +1205,6 @@ private async Task ApplyAndRefreshCurrentTabAsync()
                         // System Events tab - HealthParser data is handled by SystemEventsContent UserControl
                         SystemEventsContent.SetTimeRange(_globalHoursBack, _globalFromDate, _globalToDate);
                         await SystemEventsContent.RefreshAllDataAsync();
-                        // Configuration sub-tabs (Server Config Changes, DB Config Changes, Trace Flags) are still in ServerTab
-                        _serverConfigChangesHoursBack = _globalHoursBack;
-                        _serverConfigChangesFromDate = _globalFromDate;
-                        _serverConfigChangesToDate = _globalToDate;
-                        _dbConfigChangesHoursBack = _globalHoursBack;
-                        _dbConfigChangesFromDate = _globalFromDate;
-                        _dbConfigChangesToDate = _globalToDate;
-                        _traceFlagChangesHoursBack = _globalHoursBack;
-                        _traceFlagChangesFromDate = _globalFromDate;
-                        _traceFlagChangesToDate = _globalToDate;
-                        ServerConfigChanges_Refresh_Click(null, new RoutedEventArgs());
-                        DatabaseConfigChanges_Refresh_Click(null, new RoutedEventArgs());
-                        TraceFlagChanges_Refresh_Click(null, new RoutedEventArgs());
                         break;
 
                     default:
@@ -1287,13 +1261,14 @@ private async Task LoadDataAsync()
                 var criticalIssuesTask = CriticalIssuesTab.RefreshDataAsync();
                 var defaultTraceTask = DefaultTraceTab.RefreshAllDataAsync();
                 var currentConfigTask = CurrentConfigTab.RefreshAllDataAsync();
+                var configChangesTask = ConfigChangesTab.RefreshAllDataAsync();
                 var systemEventsTask = SystemEventsContent.RefreshAllDataAsync();
 
                 // Wait for everything to complete before _isRefreshing resets
                 await Task.WhenAll(
                     healthTask, blockingEventsTask, deadlocksTask, blockingStatsTask, lockWaitStatsTask,
                     performanceTask, memoryTask, resourceOverviewTask, runningJobsTask,
-                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, defaultTraceTask, currentConfigTask, systemEventsTask);
+                    resourceMetricsTask, dailySummaryTask, criticalIssuesTask, defaultTraceTask, currentConfigTask, configChangesTask, systemEventsTask);
 
                 // Populate grids with fetched data
                 var healthData = await healthTask;
@@ -1877,7 +1852,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
                     {
                         if (column is DataGridBoundColumn boundColumn)
                         {
-                            headers.Add(GetColumnHeader(column));
+                            headers.Add(Helpers.DataGridClipboardBehavior.GetHeaderText(column));
                         }
                     }
                     sb.AppendLine(string.Join("	", headers));
@@ -1920,7 +1895,7 @@ private void ExportToCsv_Click(object sender, RoutedEventArgs e)
                             {
                                 if (column is DataGridBoundColumn)
                                 {
-                                    headers.Add(EscapeCsvField(GetColumnHeader(column)));
+                                    headers.Add(EscapeCsvField(Helpers.DataGridClipboardBehavior.GetHeaderText(column)));
                                 }
                             }
                             sb.AppendLine(string.Join(",", headers));
@@ -2055,93 +2030,6 @@ private async void CollectionHealth_Refresh_Click(object? sender, RoutedEventArg
             }
         }
 
-        // ====================================================================
-        // Configuration Changes (System Events Tab)
-        // ====================================================================
-
-        #region Configuration Changes
-
-        // Server Configuration Changes
-        private int _serverConfigChangesHoursBack = 24;
-        private DateTime? _serverConfigChangesFromDate;
-        private DateTime? _serverConfigChangesToDate;
-
-        private async void ServerConfigChanges_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                StatusText.Text = "Loading server configuration changes...";
-                var data = await _databaseService.GetServerConfigChangesAsync(_serverConfigChangesHoursBack, _serverConfigChangesFromDate, _serverConfigChangesToDate);
-                ServerConfigChangesDataGrid.ItemsSource = data;
-                UpdateDataGridFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
-                ServerConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                StatusText.Text = $"Loaded {data.Count} server configuration change records";
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading server configuration changes: {ex.Message}");
-                StatusText.Text = "Error loading server configuration changes";
-            }
-        }
-
-        private void ServerConfigChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
-        {
-            ApplyServerConfigChangesPopupFilters();
-        }
-
-        // Database Configuration Changes
-        private int _dbConfigChangesHoursBack = 24;
-        private DateTime? _dbConfigChangesFromDate;
-        private DateTime? _dbConfigChangesToDate;
-
-        private async void DatabaseConfigChanges_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                StatusText.Text = "Loading database configuration changes...";
-                var data = await _databaseService.GetDatabaseConfigChangesAsync(_dbConfigChangesHoursBack, _dbConfigChangesFromDate, _dbConfigChangesToDate);
-                DatabaseConfigChangesDataGrid.ItemsSource = data;
-                UpdateDataGridFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
-                DatabaseConfigChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                StatusText.Text = $"Loaded {data.Count} database configuration change records";
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading database configuration changes: {ex.Message}");
-                StatusText.Text = "Error loading database configuration changes";
-            }
-        }
-
-        // Trace Flag Changes
-        private int _traceFlagChangesHoursBack = 24;
-        private DateTime? _traceFlagChangesFromDate;
-        private DateTime? _traceFlagChangesToDate;
-
-        private async void TraceFlagChanges_Refresh_Click(object? sender, RoutedEventArgs e)
-        {
-            try
-            {
-                StatusText.Text = "Loading trace flag changes...";
-                var data = await _databaseService.GetTraceFlagChangesAsync(_traceFlagChangesHoursBack, _traceFlagChangesFromDate, _traceFlagChangesToDate);
-                TraceFlagChangesDataGrid.ItemsSource = data;
-                UpdateDataGridFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
-                TraceFlagChangesNoDataMessage.Visibility = data.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
-                StatusText.Text = $"Loaded {data.Count} trace flag change records";
-            }
-            catch (Exception ex)
-            {
-                Logger.Error($"Error loading trace flag changes: {ex.Message}");
-                StatusText.Text = "Error loading trace flag changes";
-            }
-        }
-
-        private void TraceFlagChangesBoolFilter_Changed(object sender, SelectionChangedEventArgs e)
-        {
-            ApplyTraceFlagChangesPopupFilters();
-        }
-
-        #endregion
-
         // ====================================================================
         // Resource Overview Tab (on Overview tab)
         // ====================================================================
@@ -2497,15 +2385,6 @@ private void ShowFilterPopup(Button button, string columnName, string dataGridNa
             ColumnFilterState? existingFilter = null;
             switch (dataGridName)
             {
-                case "ServerConfigChanges":
-                    _serverConfigChangesFilters.TryGetValue(columnName, out existingFilter);
-                    break;
-                case "DbConfigChanges":
-                    _dbConfigChangesFilters.TryGetValue(columnName, out existingFilter);
-                    break;
-                case "TraceFlagChanges":
-                    _traceFlagChangesFilters.TryGetValue(columnName, out existingFilter);
-                    break;
                 case "CollectionHealth":
                     _collectionHealthFilters.TryGetValue(columnName, out existingFilter);
                     break;
@@ -2529,21 +2408,6 @@ private void FilterPopup_FilterApplied(object? sender, FilterAppliedEventArgs e)
 
             switch (_currentFilterDataGrid)
             {
-                case "ServerConfigChanges":
-                    UpdateFilterState(_serverConfigChangesFilters, e.FilterState);
-                    ApplyServerConfigChangesPopupFilters();
-                    UpdateDataGridFilterButtonStyles(ServerConfigChangesDataGrid, _serverConfigChangesFilters);
-                    break;
-                case "DbConfigChanges":
-                    UpdateFilterState(_dbConfigChangesFilters, e.FilterState);
-                    ApplyDbConfigChangesFilters();
-                    UpdateDataGridFilterButtonStyles(DatabaseConfigChangesDataGrid, _dbConfigChangesFilters);
-                    break;
-                case "TraceFlagChanges":
-                    UpdateFilterState(_traceFlagChangesFilters, e.FilterState);
-                    ApplyTraceFlagChangesPopupFilters();
-                    UpdateDataGridFilterButtonStyles(TraceFlagChangesDataGrid, _traceFlagChangesFilters);
-                    break;
                 case "CollectionHealth":
                     UpdateFilterState(_collectionHealthFilters, e.FilterState);
                     ApplyCollectionHealthFilters();
@@ -2636,192 +2500,6 @@ private void UpdateDataGridFilterButtonStyles(DataGrid dataGrid, Dictionary<stri
 
         #endregion
 
-        // ====================================================================
-        // Server Config Changes Filter Handlers
-        // ====================================================================
-
-        #region Server Config Changes Filters
-
-        private void ServerConfigChangesFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button button || button.Tag is not string columnName) return;
-            ShowFilterPopup(button, columnName, "ServerConfigChanges");
-        }
-
-        private void ApplyServerConfigChangesPopupFilters()
-        {
-            if (_serverConfigChangesUnfilteredData == null)
-            {
-                _serverConfigChangesUnfilteredData = ServerConfigChangesDataGrid.ItemsSource as List<ServerConfigChangeItem>;
-                if (_serverConfigChangesUnfilteredData == null && ServerConfigChangesDataGrid.ItemsSource != null)
-                {
-                    _serverConfigChangesUnfilteredData = (ServerConfigChangesDataGrid.ItemsSource as IEnumerable<ServerConfigChangeItem>)?.ToList();
-                }
-            }
-
-            if (_serverConfigChangesUnfilteredData == null) return;
-
-            // Get boolean filter states
-            var restartFilter = (ServerConfigChangesRestartFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-            var dynamicFilter = (ServerConfigChangesDynamicFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-            var advancedFilter = (ServerConfigChangesAdvancedFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-
-            if (_serverConfigChangesFilters.Count == 0 && restartFilter == "All" && dynamicFilter == "All" && advancedFilter == "All")
-            {
-                ServerConfigChangesDataGrid.ItemsSource = _serverConfigChangesUnfilteredData;
-                return;
-            }
-
-            var filteredData = _serverConfigChangesUnfilteredData.Where(item =>
-            {
-                // Apply popup filters
-                foreach (var filter in _serverConfigChangesFilters.Values)
-                {
-                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
-                    {
-                        return false;
-                    }
-                }
-
-                // Apply boolean filters
-                if (restartFilter != "All" && restartFilter != null)
-                {
-                    bool expected = restartFilter == "True";
-                    if (item.RequiresRestart != expected) return false;
-                }
-                if (dynamicFilter != "All" && dynamicFilter != null)
-                {
-                    bool expected = dynamicFilter == "True";
-                    if (item.IsDynamic != expected) return false;
-                }
-                if (advancedFilter != "All" && advancedFilter != null)
-                {
-                    bool expected = advancedFilter == "True";
-                    if (item.IsAdvanced != expected) return false;
-                }
-
-                return true;
-            }).ToList();
-
-            ServerConfigChangesDataGrid.ItemsSource = filteredData;
-        }
-
-        #endregion
-
-        // ====================================================================
-        // Database Config Changes Filter Handlers
-        // ====================================================================
-
-        #region Database Config Changes Filters
-
-        private void DbConfigChangesFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button button || button.Tag is not string columnName) return;
-            ShowFilterPopup(button, columnName, "DbConfigChanges");
-        }
-
-        private void ApplyDbConfigChangesFilters()
-        {
-            if (_dbConfigChangesUnfilteredData == null)
-            {
-                _dbConfigChangesUnfilteredData = DatabaseConfigChangesDataGrid.ItemsSource as List<DatabaseConfigChangeItem>;
-                if (_dbConfigChangesUnfilteredData == null && DatabaseConfigChangesDataGrid.ItemsSource != null)
-                {
-                    _dbConfigChangesUnfilteredData = (DatabaseConfigChangesDataGrid.ItemsSource as IEnumerable<DatabaseConfigChangeItem>)?.ToList();
-                }
-            }
-
-            if (_dbConfigChangesUnfilteredData == null) return;
-
-            if (_dbConfigChangesFilters.Count == 0)
-            {
-                DatabaseConfigChangesDataGrid.ItemsSource = _dbConfigChangesUnfilteredData;
-                return;
-            }
-
-            var filteredData = _dbConfigChangesUnfilteredData.Where(item =>
-            {
-                foreach (var filter in _dbConfigChangesFilters.Values)
-                {
-                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
-                    {
-                        return false;
-                    }
-                }
-                return true;
-            }).ToList();
-
-            DatabaseConfigChangesDataGrid.ItemsSource = filteredData;
-        }
-
-        #endregion
-
-        // ====================================================================
-        // Trace Flag Changes Filter Handlers
-        // ====================================================================
-
-        #region Trace Flag Changes Filters
-
-        private void TraceFlagChangesFilter_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button button || button.Tag is not string columnName) return;
-            ShowFilterPopup(button, columnName, "TraceFlagChanges");
-        }
-
-        private void ApplyTraceFlagChangesPopupFilters()
-        {
-            if (_traceFlagChangesUnfilteredData == null)
-            {
-                _traceFlagChangesUnfilteredData = TraceFlagChangesDataGrid.ItemsSource as List<TraceFlagChangeItem>;
-                if (_traceFlagChangesUnfilteredData == null && TraceFlagChangesDataGrid.ItemsSource != null)
-                {
-                    _traceFlagChangesUnfilteredData = (TraceFlagChangesDataGrid.ItemsSource as IEnumerable<TraceFlagChangeItem>)?.ToList();
-                }
-            }
-
-            if (_traceFlagChangesUnfilteredData == null) return;
-
-            // Get boolean filter states
-            var globalFilter = (TraceFlagChangesGlobalFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-            var sessionFilter = (TraceFlagChangesSessionFilterCombo?.SelectedItem as ComboBoxItem)?.Content?.ToString();
-
-            if (_traceFlagChangesFilters.Count == 0 && globalFilter == "All" && sessionFilter == "All")
-            {
-                TraceFlagChangesDataGrid.ItemsSource = _traceFlagChangesUnfilteredData;
-                return;
-            }
-
-            var filteredData = _traceFlagChangesUnfilteredData.Where(item =>
-            {
-                // Apply popup filters
-                foreach (var filter in _traceFlagChangesFilters.Values)
-                {
-                    if (filter.IsActive && !DataGridFilterService.MatchesFilter(item, filter))
-                    {
-                        return false;
-                    }
-                }
-
-                // Apply boolean filters
-                if (globalFilter != "All" && globalFilter != null)
-                {
-                    bool expected = globalFilter == "True";
-                    if (item.IsGlobal != expected) return false;
-                }
-                if (sessionFilter != "All" && sessionFilter != null)
-                {
-                    bool expected = sessionFilter == "True";
-                    if (item.IsSession != expected) return false;
-                }
-
-                return true;
-            }).ToList();
-
-            TraceFlagChangesDataGrid.ItemsSource = filteredData;
-        }
-
-        #endregion
-
         // ====================================================================
         // Collection Health Filter Handlers
         // ====================================================================
diff --git a/Dashboard/Services/ServerManager.cs b/Dashboard/Services/ServerManager.cs
index 9d1ad8c5..cf9099dd 100644
--- a/Dashboard/Services/ServerManager.cs
+++ b/Dashboard/Services/ServerManager.cs
@@ -140,6 +140,31 @@ public void DeleteServer(string id)
             }
         }
 
+        public async Task DropMonitorDatabaseAsync(ServerConnection server)
+        {
+            var connectionString = server.GetConnectionString(_credentialService);
+            var builder = new SqlConnectionStringBuilder(connectionString)
+            {
+                InitialCatalog = "master",
+                ConnectTimeout = 10
+            };
+
+            using var connection = new SqlConnection(builder.ConnectionString);
+            await connection.OpenAsync();
+
+            // Close active connections before dropping
+            using var killCmd = new SqlCommand(@"
+                IF DB_ID('PerformanceMonitor') IS NOT NULL
+                BEGIN
+                    ALTER DATABASE [PerformanceMonitor] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
+                    DROP DATABASE [PerformanceMonitor];
+                END", connection);
+            killCmd.CommandTimeout = 30;
+            await killCmd.ExecuteNonQueryAsync();
+
+            Logger.Info($"Dropped PerformanceMonitor database on '{server.DisplayName}'");
+        }
+
         public void UpdateLastConnected(string id)
         {
             lock (_serversLock)
diff --git a/Dashboard/Themes/DarkTheme.xaml b/Dashboard/Themes/DarkTheme.xaml
index d5fbb78a..52c14fa2 100644
--- a/Dashboard/Themes/DarkTheme.xaml
+++ b/Dashboard/Themes/DarkTheme.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorDashboard.Helpers">
 
     <!-- ============================================ -->
     <!-- Darling Data Dark Theme                      -->
@@ -609,6 +610,7 @@
     <!-- DataGrid Style                               -->
     <!-- ============================================ -->
     <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
         <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
         <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
diff --git a/Lite/Controls/ServerTab.xaml b/Lite/Controls/ServerTab.xaml
index 41110533..689218c2 100644
--- a/Lite/Controls/ServerTab.xaml
+++ b/Lite/Controls/ServerTab.xaml
@@ -416,6 +416,33 @@
                                     <DataGridTextColumn Binding="{Binding TotalPhysicalReads, StringFormat=N0}" Width="110">
                                         <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalPhysicalReads" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Physical Reads" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
                                     </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding TotalSpills, StringFormat=N0}" Width="90">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="TotalSpills" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Total Spills" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinCpuMs, StringFormat=N2}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxCpuMs, StringFormat=N2}" Width="100">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxCpuMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max CPU (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MinElapsedMs, StringFormat=N2}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MinElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Min Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding MaxElapsedMs, StringFormat=N2}" Width="120">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="MaxElapsedMs" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Max Duration (ms)" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTextColumn Binding="{Binding PlanHandle}" Width="140">
+                                        <DataGridTextColumn.Header><StackPanel Orientation="Horizontal"><Button Style="{DynamicResource ColumnFilterButtonStyle}" Tag="PlanHandle" Click="FilterButton_Click" Margin="0,0,4,0"/><TextBlock Text="Plan Handle" FontWeight="Bold" VerticalAlignment="Center"/></StackPanel></DataGridTextColumn.Header>
+                                    </DataGridTextColumn>
+                                    <DataGridTemplateColumn Header="Query Plan" Width="Auto" MinWidth="90">
+                                        <DataGridTemplateColumn.CellTemplate>
+                                            <DataTemplate>
+                                                <Button Content="Download" Click="DownloadProcedurePlan_Click"
+                                                        HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                        Padding="8,4"/>
+                                            </DataTemplate>
+                                        </DataGridTemplateColumn.CellTemplate>
+                                    </DataGridTemplateColumn>
                                 </DataGrid.Columns>
                             </DataGrid>
                         </TabItem>
@@ -586,11 +613,15 @@
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*"/>
                                     <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
                                 </Grid.RowDefinitions>
                                 <Border Grid.Row="0" Margin="0,0,0,4">
+                                    <ScottPlot:WpfPlot x:Name="LockWaitTrendChart"/>
+                                </Border>
+                                <Border Grid.Row="1" Margin="0,4,0,4">
                                     <ScottPlot:WpfPlot x:Name="BlockingTrendChart"/>
                                 </Border>
-                                <Border Grid.Row="1" Margin="0,4,0,0">
+                                <Border Grid.Row="2" Margin="0,4,0,0">
                                     <ScottPlot:WpfPlot x:Name="DeadlockTrendChart"/>
                                 </Border>
                             </Grid>
diff --git a/Lite/Controls/ServerTab.xaml.cs b/Lite/Controls/ServerTab.xaml.cs
index a400e825..03725364 100644
--- a/Lite/Controls/ServerTab.xaml.cs
+++ b/Lite/Controls/ServerTab.xaml.cs
@@ -50,6 +50,7 @@ public partial class ServerTab : UserControl
     private Helpers.ChartHoverHelper? _procDurationTrendHover;
     private Helpers.ChartHoverHelper? _queryStoreDurationTrendHover;
     private Helpers.ChartHoverHelper? _executionCountTrendHover;
+    private Helpers.ChartHoverHelper? _lockWaitTrendHover;
     private Helpers.ChartHoverHelper? _blockingTrendHover;
     private Helpers.ChartHoverHelper? _deadlockTrendHover;
 
@@ -136,6 +137,15 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
         /* Initialize column filter managers */
         InitializeFilterManagers();
 
+        /* Fix DataGrid copy — StackPanel headers copy as type name without this */
+        foreach (var grid in new DataGrid[] { QuerySnapshotsGrid, QueryStatsGrid, ProcedureStatsGrid,
+            QueryStoreGrid, BlockedProcessReportGrid, DeadlockGrid, RunningJobsGrid,
+            ServerConfigGrid, DatabaseConfigGrid, DatabaseScopedConfigGrid, TraceFlagsGrid,
+            CollectionHealthGrid, CollectionLogGrid })
+        {
+            grid.CopyingRowClipboardContent += Helpers.DataGridClipboardBehavior.FixHeaderCopy;
+        }
+
         /* Chart hover tooltips */
         _waitStatsHover = new Helpers.ChartHoverHelper(WaitStatsChart, "ms/sec");
         _perfmonHover = new Helpers.ChartHoverHelper(PerfmonChart, "");
@@ -150,6 +160,7 @@ public ServerTab(ServerConnection server, DuckDbInitializer duckDb, CredentialSe
         _procDurationTrendHover = new Helpers.ChartHoverHelper(ProcDurationTrendChart, "ms/sec");
         _queryStoreDurationTrendHover = new Helpers.ChartHoverHelper(QueryStoreDurationTrendChart, "ms/sec");
         _executionCountTrendHover = new Helpers.ChartHoverHelper(ExecutionCountTrendChart, "/sec");
+        _lockWaitTrendHover = new Helpers.ChartHoverHelper(LockWaitTrendChart, "ms/sec");
         _blockingTrendHover = new Helpers.ChartHoverHelper(BlockingTrendChart, "incidents");
         _deadlockTrendHover = new Helpers.ChartHoverHelper(DeadlockTrendChart, "deadlocks");
 
@@ -478,6 +489,7 @@ await System.Threading.Tasks.Task.WhenAll(
                 runningJobsTask, collectionHealthTask, collectionLogTask);
 
             /* Trend chart tasks - run separately so failures don't kill the whole refresh */
+            var lockWaitTrendTask = SafeQueryAsync(() => _dataService.GetLockWaitTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var blockingTrendTask = SafeQueryAsync(() => _dataService.GetBlockingTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var deadlockTrendTask = SafeQueryAsync(() => _dataService.GetDeadlockTrendAsync(_serverId, hoursBack, fromDate, toDate));
             var queryDurationTrendTask = SafeQueryAsync(() => _dataService.GetQueryDurationTrendAsync(_serverId, hoursBack, fromDate, toDate));
@@ -486,7 +498,7 @@ await System.Threading.Tasks.Task.WhenAll(
             var executionCountTrendTask = SafeQueryAsync(() => _dataService.GetExecutionCountTrendAsync(_serverId, hoursBack, fromDate, toDate));
 
             await System.Threading.Tasks.Task.WhenAll(
-                blockingTrendTask, deadlockTrendTask,
+                lockWaitTrendTask, blockingTrendTask, deadlockTrendTask,
                 queryDurationTrendTask, procDurationTrendTask, queryStoreDurationTrendTask, executionCountTrendTask);
 
             loadSw.Stop();
@@ -525,6 +537,7 @@ await System.Threading.Tasks.Task.WhenAll(
             UpdateTempDbChart(tempDbTask.Result);
             UpdateTempDbFileIoChart(tempDbFileIoTask.Result);
             UpdateFileIoCharts(fileIoTrendTask.Result);
+            UpdateLockWaitTrendChart(lockWaitTrendTask.Result, hoursBack, fromDate, toDate);
             UpdateBlockingTrendChart(blockingTrendTask.Result, hoursBack, fromDate, toDate);
             UpdateDeadlockTrendChart(deadlockTrendTask.Result, hoursBack, fromDate, toDate);
             UpdateQueryDurationTrendChart(queryDurationTrendTask.Result);
@@ -843,6 +856,68 @@ private void UpdateFileIoCharts(List<FileIoTrendPoint> data)
 
     /* ========== Blocking/Deadlock Trend Charts ========== */
 
+    private void UpdateLockWaitTrendChart(List<LockWaitTrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
+    {
+        ClearChart(LockWaitTrendChart);
+        ApplyDarkTheme(LockWaitTrendChart);
+
+        DateTime rangeStart, rangeEnd;
+        if (fromDate.HasValue && toDate.HasValue)
+        {
+            rangeStart = fromDate.Value;
+            rangeEnd = toDate.Value;
+        }
+        else
+        {
+            rangeEnd = DateTime.UtcNow.AddMinutes(UtcOffsetMinutes);
+            rangeStart = rangeEnd.AddHours(-hoursBack);
+        }
+
+        _lockWaitTrendHover?.Clear();
+        if (data.Count == 0)
+        {
+            var zeroLine = LockWaitTrendChart.Plot.Add.Scatter(
+                new[] { rangeStart.ToOADate(), rangeEnd.ToOADate() },
+                new[] { 0.0, 0.0 });
+            zeroLine.LegendText = "Lock Waits";
+            zeroLine.Color = ScottPlot.Color.FromHex("#4FC3F7");
+            zeroLine.MarkerSize = 0;
+            LockWaitTrendChart.Plot.Axes.DateTimeTicksBottom();
+            LockWaitTrendChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+            ReapplyAxisColors(LockWaitTrendChart);
+            LockWaitTrendChart.Plot.YLabel("Lock Wait Time (ms/sec)");
+            SetChartYLimitsWithLegendPadding(LockWaitTrendChart, 0, 1);
+            ShowChartLegend(LockWaitTrendChart);
+            LockWaitTrendChart.Refresh();
+            return;
+        }
+
+        var grouped = data.GroupBy(d => d.WaitType).ToList();
+        double globalMax = 0;
+
+        for (int i = 0; i < grouped.Count; i++)
+        {
+            var group = grouped[i];
+            var times = group.Select(t => t.CollectionTime.AddMinutes(UtcOffsetMinutes).ToOADate()).ToArray();
+            var values = group.Select(t => t.WaitTimeMsPerSecond).ToArray();
+
+            var plot = LockWaitTrendChart.Plot.Add.Scatter(times, values);
+            plot.LegendText = group.Key;
+            plot.Color = ScottPlot.Color.FromHex(SeriesColors[i % SeriesColors.Length]);
+            _lockWaitTrendHover?.Add(plot, group.Key);
+
+            if (values.Length > 0) globalMax = Math.Max(globalMax, values.Max());
+        }
+
+        LockWaitTrendChart.Plot.Axes.DateTimeTicksBottom();
+        LockWaitTrendChart.Plot.Axes.SetLimitsX(rangeStart.ToOADate(), rangeEnd.ToOADate());
+        ReapplyAxisColors(LockWaitTrendChart);
+        LockWaitTrendChart.Plot.YLabel("Lock Wait Time (ms/sec)");
+        SetChartYLimitsWithLegendPadding(LockWaitTrendChart, 0, globalMax > 0 ? globalMax : 1);
+        ShowChartLegend(LockWaitTrendChart);
+        LockWaitTrendChart.Refresh();
+    }
+
     private void UpdateBlockingTrendChart(List<TrendPoint> data, int hoursBack, DateTime? fromDate, DateTime? toDate)
     {
         ClearChart(BlockingTrendChart);
@@ -1630,7 +1705,7 @@ private void CopyAllRows_Click(object sender, RoutedEventArgs e)
         /* Header */
         foreach (var col in grid.Columns)
         {
-            sb.Append(col.Header?.ToString() ?? "");
+            sb.Append(Helpers.DataGridClipboardBehavior.GetHeaderText(col));
             sb.Append('\t');
         }
         sb.AppendLine();
@@ -1817,14 +1892,91 @@ private async void DownloadQueryStatsPlan_Click(object sender, RoutedEventArgs e
         btn.Content = "...";
         try
         {
-            var connStr = _server.GetConnectionString(_credentialService);
-            var plan = await LocalDataService.FetchQueryPlanOnDemandAsync(connStr, row.QueryHash);
+            string? plan = null;
+            var source = "collected data";
+
+            // Try DuckDB first
+            try
+            {
+                plan = await _dataService.GetCachedQueryPlanAsync(_serverId, row.QueryHash);
+            }
+            catch
+            {
+                // DuckDB lookup failed, fall through to live server
+            }
+
+            // Fall back to live server
+            if (string.IsNullOrEmpty(plan))
+            {
+                var connStr = _server.GetConnectionString(_credentialService);
+                plan = await LocalDataService.FetchQueryPlanOnDemandAsync(connStr, row.QueryHash);
+                source = "live server";
+            }
+
             if (string.IsNullOrEmpty(plan))
             {
-                MessageBox.Show("No query plan found in the plan cache for this query hash. The plan may have been evicted.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show("No query plan found in collected data or the live plan cache for this query hash.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
+
             SavePlanFile(plan, $"QueryPlan_{row.QueryHash}");
+            btn.Content = $"Saved ({source})";
+            return;
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Failed to retrieve plan: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+        finally
+        {
+            if (btn.Content is "...")
+                btn.Content = "Download";
+            btn.IsEnabled = true;
+        }
+    }
+
+    private async void DownloadProcedurePlan_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is not Button btn || btn.DataContext is not ProcedureStatsRow row) return;
+        if (string.IsNullOrEmpty(row.ObjectName)) return;
+
+        btn.IsEnabled = false;
+        btn.Content = "...";
+        try
+        {
+            string? plan = null;
+            var source = "collected data";
+
+            // Try DuckDB first — match by plan_handle in query_stats
+            if (!string.IsNullOrEmpty(row.PlanHandle))
+            {
+                try
+                {
+                    plan = await _dataService.GetCachedProcedurePlanAsync(_serverId, row.PlanHandle);
+                }
+                catch
+                {
+                    // DuckDB lookup failed, fall through to live server
+                }
+            }
+
+            // Fall back to live server
+            if (string.IsNullOrEmpty(plan))
+            {
+                var connStr = _server.GetConnectionString(_credentialService);
+                plan = await LocalDataService.FetchProcedurePlanOnDemandAsync(connStr, row.DatabaseName, row.SchemaName, row.ObjectName);
+                source = "live server";
+            }
+
+            if (string.IsNullOrEmpty(plan))
+            {
+                MessageBox.Show("No query plan found in collected data or the live plan cache for this procedure.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            SavePlanFile(plan, $"ProcPlan_{row.FullName}");
+            btn.Content = $"Saved ({source})";
+            return;
         }
         catch (Exception ex)
         {
@@ -1832,7 +1984,8 @@ private async void DownloadQueryStatsPlan_Click(object sender, RoutedEventArgs e
         }
         finally
         {
-            btn.Content = "Save";
+            if (btn.Content is "...")
+                btn.Content = "Download";
             btn.IsEnabled = true;
         }
     }
diff --git a/Lite/Helpers/DataGridClipboardBehavior.cs b/Lite/Helpers/DataGridClipboardBehavior.cs
new file mode 100644
index 00000000..b01de495
--- /dev/null
+++ b/Lite/Helpers/DataGridClipboardBehavior.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026 Erik Darling, Darling Data LLC
+ *
+ * This file is part of the SQL Server Performance Monitor Lite.
+ *
+ * Licensed under the MIT License. See LICENSE file in the project root for full license information.
+ */
+
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace PerformanceMonitorLite.Helpers;
+
+/// <summary>
+/// Attached behavior that fixes DataGrid clipboard copy when column headers
+/// use StackPanel (e.g. filter button + text). Without this, copied headers
+/// show "System.Windows.Controls.StackPanel" instead of the column name.
+/// </summary>
+public static class DataGridClipboardBehavior
+{
+    public static readonly DependencyProperty FixHeaderCopyProperty =
+        DependencyProperty.RegisterAttached(
+            "FixHeaderCopy",
+            typeof(bool),
+            typeof(DataGridClipboardBehavior),
+            new PropertyMetadata(false, OnFixHeaderCopyChanged));
+
+    public static bool GetFixHeaderCopy(DependencyObject obj) => (bool)obj.GetValue(FixHeaderCopyProperty);
+    public static void SetFixHeaderCopy(DependencyObject obj, bool value) => obj.SetValue(FixHeaderCopyProperty, value);
+
+    private static void OnFixHeaderCopyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DataGrid grid && (bool)e.NewValue)
+        {
+            grid.CopyingRowClipboardContent += FixHeaderCopy;
+        }
+    }
+
+    /// <summary>
+    /// Extracts the display text from a DataGrid column header.
+    /// Handles StackPanel headers (filter button + TextBlock) by returning the TextBlock text.
+    /// </summary>
+    public static string GetHeaderText(DataGridColumn column)
+    {
+        if (column.Header is StackPanel sp)
+        {
+            var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+            if (tb != null) return tb.Text;
+        }
+        return column.Header?.ToString() ?? "";
+    }
+
+    /// <summary>
+    /// Event handler that can be wired directly to DataGrid.CopyingRowClipboardContent.
+    /// </summary>
+    public static void FixHeaderCopy(object? sender, DataGridRowClipboardEventArgs e)
+    {
+        if (!e.IsColumnHeadersRow) return;
+
+        for (int i = 0; i < e.ClipboardRowContent.Count; i++)
+        {
+            var cell = e.ClipboardRowContent[i];
+            if (cell.Column?.Header is StackPanel sp)
+            {
+                var tb = sp.Children.OfType<TextBlock>().FirstOrDefault();
+                if (tb != null)
+                {
+                    e.ClipboardRowContent[i] = new DataGridClipboardCellContent(cell.Item, cell.Column, tb.Text);
+                }
+            }
+        }
+    }
+}
diff --git a/Lite/Services/LocalDataService.Blocking.cs b/Lite/Services/LocalDataService.Blocking.cs
index e82f781d..c68f9be7 100644
--- a/Lite/Services/LocalDataService.Blocking.cs
+++ b/Lite/Services/LocalDataService.Blocking.cs
@@ -377,6 +377,63 @@ GROUP BY DATE_TRUNC('hour', deadlock_time)
         }
         return items;
     }
+    /// <summary>
+    /// Gets lock wait stats trend data (LCK% wait types) for the blocking trends chart.
+    /// Returns per-second rates grouped by wait type.
+    /// </summary>
+    public async Task<List<LockWaitTrendPoint>> GetLockWaitTrendAsync(int serverId, int hoursBack = 24, DateTime? fromDate = null, DateTime? toDate = null)
+    {
+        using var connection = await OpenConnectionAsync();
+        using var command = connection.CreateCommand();
+
+        var (startTime, endTime) = GetTimeRange(hoursBack, fromDate, toDate);
+
+        command.CommandText = @"
+WITH raw AS
+(
+    SELECT
+        collection_time,
+        wait_type,
+        delta_wait_time_ms,
+        date_diff('second', LAG(collection_time) OVER (PARTITION BY wait_type ORDER BY collection_time), collection_time) AS interval_seconds
+    FROM v_wait_stats
+    WHERE server_id = $1
+    AND   wait_type LIKE 'LCK%'
+    AND   collection_time >= $2
+    AND   collection_time <= $3
+)
+SELECT
+    collection_time,
+    wait_type,
+    CASE WHEN interval_seconds > 0 THEN CAST(delta_wait_time_ms AS DOUBLE) / interval_seconds ELSE 0 END AS wait_time_ms_per_second
+FROM raw
+WHERE delta_wait_time_ms >= 0
+ORDER BY collection_time, wait_type";
+
+        command.Parameters.Add(new DuckDBParameter { Value = serverId });
+        command.Parameters.Add(new DuckDBParameter { Value = startTime });
+        command.Parameters.Add(new DuckDBParameter { Value = endTime });
+
+        var items = new List<LockWaitTrendPoint>();
+        using var reader = await command.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            items.Add(new LockWaitTrendPoint
+            {
+                CollectionTime = reader.GetDateTime(0),
+                WaitType = reader.IsDBNull(1) ? string.Empty : reader.GetString(1),
+                WaitTimeMsPerSecond = reader.IsDBNull(2) ? 0 : reader.GetDouble(2)
+            });
+        }
+        return items;
+    }
+}
+
+public class LockWaitTrendPoint
+{
+    public DateTime CollectionTime { get; set; }
+    public string WaitType { get; set; } = string.Empty;
+    public double WaitTimeMsPerSecond { get; set; }
 }
 
 public class TrendPoint
diff --git a/Lite/Services/LocalDataService.QueryStats.cs b/Lite/Services/LocalDataService.QueryStats.cs
index 0ed8a34c..7c22a2b8 100644
--- a/Lite/Services/LocalDataService.QueryStats.cs
+++ b/Lite/Services/LocalDataService.QueryStats.cs
@@ -72,6 +72,7 @@ FROM v_query_stats
 AND   collection_time <= $3
 AND   query_text NOT LIKE 'WAITFOR%'
 GROUP BY database_name, query_hash
+HAVING SUM(delta_execution_count) > 0 OR SUM(delta_elapsed_time) > 0
 ORDER BY SUM(delta_elapsed_time) DESC
 LIMIT $4";
 
@@ -229,6 +230,52 @@ FROM v_procedure_stats
         return items;
     }
 
+    /// <summary>
+    /// Looks up a cached query plan from DuckDB by server_id and query_hash.
+    /// Returns the most recently collected plan XML, or null if not found.
+    /// </summary>
+    public async Task<string?> GetCachedQueryPlanAsync(int serverId, string queryHash)
+    {
+        const string query = @"
+SELECT query_plan_xml
+FROM v_query_stats
+WHERE server_id = $1
+AND   query_hash = $2
+AND   query_plan_xml IS NOT NULL
+AND   query_plan_xml <> ''
+ORDER BY collection_time DESC
+LIMIT 1";
+
+        using var connection = await OpenConnectionAsync();
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = query;
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = serverId });
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = queryHash });
+        var result = await cmd.ExecuteScalarAsync();
+        return result as string;
+    }
+
+    public async Task<string?> GetCachedProcedurePlanAsync(int serverId, string planHandle)
+    {
+        const string query = @"
+SELECT query_plan_xml
+FROM v_query_stats
+WHERE server_id = $1
+AND   plan_handle = $2
+AND   query_plan_xml IS NOT NULL
+AND   query_plan_xml <> ''
+ORDER BY collection_time DESC
+LIMIT 1";
+
+        using var connection = await OpenConnectionAsync();
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = query;
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = serverId });
+        cmd.Parameters.Add(new DuckDB.NET.Data.DuckDBParameter { Value = planHandle });
+        var result = await cmd.ExecuteScalarAsync();
+        return result as string;
+    }
+
     /// <summary>
     /// Fetches a query plan on-demand from the remote server by query hash.
     /// </summary>
@@ -335,6 +382,7 @@ FROM v_procedure_stats
 AND   collection_time >= $2
 AND   collection_time <= $3
 GROUP BY database_name, schema_name, object_name, object_type
+HAVING SUM(delta_execution_count) > 0 OR SUM(delta_elapsed_time) > 0
 ORDER BY SUM(delta_elapsed_time) DESC
 LIMIT $4";
 
diff --git a/Lite/Themes/DarkTheme.xaml b/Lite/Themes/DarkTheme.xaml
index f17ce306..18294a10 100644
--- a/Lite/Themes/DarkTheme.xaml
+++ b/Lite/Themes/DarkTheme.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:helpers="clr-namespace:PerformanceMonitorLite.Helpers">
 
     <!-- ============================================ -->
     <!-- Darling Data Dark Theme                      -->
@@ -566,6 +567,7 @@
     <!-- DataGrid Style                               -->
     <!-- ============================================ -->
     <Style TargetType="DataGrid">
+        <Setter Property="helpers:DataGridClipboardBehavior.FixHeaderCopy" Value="True"/>
         <Setter Property="Background" Value="{StaticResource BackgroundDarkBrush}"/>
         <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}"/>
         <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
diff --git a/Lite/Windows/QueryStatsHistoryWindow.xaml.cs b/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
index 69e54338..65297dd4 100644
--- a/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
+++ b/Lite/Windows/QueryStatsHistoryWindow.xaml.cs
@@ -119,16 +119,35 @@ private void UpdateChart()
     private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
     {
         if (sender is not Button btn) return;
-        if (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(_queryHash)) return;
+        if (string.IsNullOrEmpty(_queryHash)) return;
 
         btn.IsEnabled = false;
         btn.Content = "...";
         try
         {
-            var plan = await LocalDataService.FetchQueryPlanOnDemandAsync(_connectionString, _queryHash);
+            string? plan = null;
+            var source = "collected data";
+
+            // Try DuckDB first — plan may already be cached from collection
+            try
+            {
+                plan = await _dataService.GetCachedQueryPlanAsync(_serverId, _queryHash);
+            }
+            catch
+            {
+                // DuckDB lookup failed, fall through to live server
+            }
+
+            // Fall back to live server if DuckDB didn't have it
+            if (string.IsNullOrEmpty(plan) && !string.IsNullOrEmpty(_connectionString))
+            {
+                plan = await LocalDataService.FetchQueryPlanOnDemandAsync(_connectionString, _queryHash);
+                source = "live server";
+            }
+
             if (string.IsNullOrEmpty(plan))
             {
-                MessageBox.Show("No query plan found in the plan cache for this query hash. The plan may have been evicted.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show("No query plan found in collected data or the live plan cache for this query hash.", "Plan Not Found", MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
             }
 
@@ -141,6 +160,8 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
 
             if (dialog.ShowDialog() != true) return;
             File.WriteAllText(dialog.FileName, plan, Encoding.UTF8);
+            btn.Content = $"Saved ({source})";
+            return;
         }
         catch (Exception ex)
         {
@@ -148,7 +169,8 @@ private async void DownloadPlan_Click(object sender, RoutedEventArgs e)
         }
         finally
         {
-            btn.Content = "Download";
+            if (btn.Content is "...")
+                btn.Content = "Download";
             btn.IsEnabled = true;
         }
     }
diff --git a/README.md b/README.md
index 3562944b..2d15e7ec 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ ORDER BY collection_time DESC;
 
 ### Data Retention
 
-Default: 30 days (configurable per table in `config.retention_settings`).
+Default: 30 days (configurable per collector via `retention_days` in `config.collection_schedule`).
 
 Storage estimates: 5-10 GB per week, 20-40 GB per month.