diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index 3a9f670..6161d5b 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -70,7 +70,7 @@
                 <StackPanel Spacing="4">
                     <TextBlock Text="Group by" Foreground="{DynamicResource ForegroundBrush}" FontSize="11"/>
                     <ComboBox x:Name="GroupByBox" Width="130" Height="36" FontSize="13"
-                              SelectedIndex="0" SelectionChanged="GroupBy_SelectionChanged">
+                              SelectedIndex="1" SelectionChanged="GroupBy_SelectionChanged">
                         <ComboBoxItem Content="None" Tag="none"/>
                         <ComboBoxItem Content="Query Hash" Tag="query-hash"/>
                         <ComboBoxItem Content="Module" Tag="module"/>
@@ -150,7 +150,7 @@
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <DataGridTemplateColumn Header="" Width="220" IsVisible="False">
+                <DataGridTemplateColumn Header="" Width="220" IsVisible="True">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate x:DataType="local:QueryStoreRow">
                             <StackPanel Orientation="Horizontal" Margin="{Binding IndentMargin}"
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index c7261a9..9911142 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -44,7 +44,7 @@ public partial class QueryStoreGridControl : UserControl
     private bool _waitStatsSupported;  // false until version + capture mode confirmed
     private bool _waitStatsEnabled = true;
     private bool _waitPercentMode;
-    private QueryStoreGroupBy _groupByMode = QueryStoreGroupBy.None;
+    private QueryStoreGroupBy _groupByMode = QueryStoreGroupBy.QueryHash;
     private List<QueryStoreRow> _groupedRootRows = new(); // top-level rows for grouped mode
 
     public event EventHandler<List<QueryStorePlan>>? PlansSelected;
@@ -89,6 +89,7 @@ public QueryStoreGridControl(ServerConnection serverConnection, ICredentialServi
         // Auto-fetch with default settings on connect
         Avalonia.Threading.Dispatcher.UIThread.Post(() =>
         {
+            ReorderColumnsForGroupBy();
             Fetch_Click(null, new RoutedEventArgs());
             _initialOrderByLoaded = true;
         }, Avalonia.Threading.DispatcherPriority.Loaded);
@@ -311,12 +312,7 @@ private async System.Threading.Tasks.Task FetchGroupedPlansAsync(
         LoadButton.IsEnabled = true;
         SelectToggleButton.Content = "Select All";
 
-        // Auto-expand the first root row to the deepest level
-        if (rootRows.Count > 0)
-        {
-            var first = rootRows[0];
-            ExpandRowRecursive(first);
-        }
+
 
         UpdateStatusText();
         UpdateBarRatios();