From ddc39805c1249f532904738aeadee3fa4e402d75 Mon Sep 17 00:00:00 2001
From: Yuki Matsuzawa <matsuzawa.yuki.8k@kyoto-u.ac.jp>
Date: Thu, 16 Jul 2026 16:59:30 +0900
Subject: [PATCH 1/7] Add Ion filter clear controls

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Model/Search/KeywordFilterModel.cs        |  4 ++
 .../Model/Search/PeakSpotNavigatorModel.cs    | 11 +++++
 .../PeakSpotTagSearchQueryBuilderModel.cs     |  9 ++++
 .../Model/Search/ValueFilterModel.cs          |  6 +++
 .../View/Lcms/LcmsAnalysisPeakTableView.xaml  | 43 ++++++++++++++++++-
 .../Search/KeywordFilterViewModel.cs          |  7 +++
 .../Search/PeakSpotNavigatorViewModel.cs      |  3 ++
 .../PeakSpotTagSearchQueryBuilderViewModel.cs |  9 ++++
 .../ViewModel/Search/ValueFilterViewModel.cs  |  4 ++
 9 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
index 5f6d9799f..d5006b191 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
@@ -56,6 +56,10 @@ public async Task SetKeywordsAsync(IEnumerable<string> keywords, CancellationTok
             }
         }
 
+        public void ClearKeywords() {
+            SetKeywords(Enumerable.Empty<string>());
+        }
+
         private void SetKeywords(IEnumerable<string> keywords) {
             _keywords.Clear();
             _keywords.AddRange(keywords);
diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs
index 491cd1193..81c8df1d4 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs
@@ -46,6 +46,17 @@ public string? SelectedAnnotationLabel {
         public PeakSpotTagSearchQueryBuilderModel TagSearchQueryBuilder { get; }
         public ObservableCollection<PeakFilterModel> PeakFilters { get; } = new ObservableCollection<PeakFilterModel>();
 
+        public void ResetFilters() {
+            AmplitudeFilterModel.Reset();
+            foreach (var valueFilterModel in ValueFilterModels) {
+                valueFilterModel.Reset();
+            }
+            foreach (var keywordFilterModel in KeywordFilterModels) {
+                keywordFilterModel.ClearKeywords();
+            }
+            TagSearchQueryBuilder.Reset();
+        }
+
         public void RefreshCollectionViews() {
             foreach (var view in PeakSpotsCollection) {
                 view.Refresh();
diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotTagSearchQueryBuilderModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotTagSearchQueryBuilderModel.cs
index 834ca5a0d..994d49736 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotTagSearchQueryBuilderModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotTagSearchQueryBuilderModel.cs
@@ -42,6 +42,15 @@ public bool Excludes {
         }
         private bool _excludes;
 
+        public void Reset() {
+            Confirmed = false;
+            LowQualitySpectrum = false;
+            Misannotation = false;
+            Coelution = false;
+            Overannotation = false;
+            Excludes = false;
+        }
+
         public PeakSpotTagSearchQuery CreateQuery() {
             var tags = new List<PeakSpotTag>();
             if (Confirmed) {
diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/ValueFilterModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/ValueFilterModel.cs
index 307591f02..1c4249b0d 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/ValueFilterModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/ValueFilterModel.cs
@@ -58,6 +58,12 @@ public bool Contains(double value) {
             return Lower <= value && value <= Upper;
         }
 
+        public void Reset() {
+            Lower = Minimum;
+            Upper = Maximum;
+            IsEnabled = false;
+        }
+
         public bool IsEnabled {
             get => _isEnabled;
             set => SetProperty(ref _isEnabled, value);
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml
index c118b4ab3..2b9a6bd33 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml
@@ -87,8 +87,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
@@ -128,6 +162,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        Margin="8,0"
+                        VerticalAlignment="Center" HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs
index a35c03d0a..9618ee699 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs
@@ -17,6 +17,8 @@ internal sealed class KeywordFilterViewModel : ViewModelBase
         public KeywordFilterViewModel(KeywordFilterModel model) {
             _model = model ?? throw new ArgumentNullException(nameof(model));
             Keywords = new ReactivePropertySlim<string>(string.Empty).AddTo(Disposables);
+            ClearCommand = new ReactiveCommand().AddTo(Disposables);
+            ClearCommand.Subscribe(_ => Clear()).AddTo(Disposables);
             Keywords.Where(keywords => keywords != null)
                 .SelectSwitch(keywords => Observable.FromAsync(token => model.SetKeywordsAsync(keywords.Split(), token)))
                 .Subscribe()
@@ -25,6 +27,11 @@ public KeywordFilterViewModel(KeywordFilterModel model) {
 
         public string Label => _model.Label;
         public ReactivePropertySlim<string> Keywords { get; }
+        public ReactiveCommand ClearCommand { get; }
+
+        public void Clear() {
+            Keywords.Value = string.Empty;
+        }
 
         public IObservable<Unit> ObserveChanged => Keywords.ToUnit();
     }
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotNavigatorViewModel.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotNavigatorViewModel.cs
index 8c9b40f9b..347accf6d 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotNavigatorViewModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotNavigatorViewModel.cs
@@ -23,6 +23,8 @@ public PeakSpotNavigatorViewModel(PeakSpotNavigatorModel model) {
                 .AddTo(Disposables);
             PeakFilterViewModel = new PeakFilterViewModel(model.PeakFilters.ToArray()).AddTo(Disposables);
             TagSearchBuilderViewModel = new PeakSpotTagSearchQueryBuilderViewModel(model.TagSearchQueryBuilder).AddTo(Disposables);
+            ResetFiltersCommand = new ReactiveCommand().AddTo(Disposables);
+            ResetFiltersCommand.Subscribe(_ => model.ResetFilters()).AddTo(Disposables);
 
             AmplitudeLowerValue = model.AmplitudeFilterModel
                 .ToReactivePropertyAsSynchronized(m => m.Lower)
@@ -74,6 +76,7 @@ public PeakSpotNavigatorViewModel(PeakSpotNavigatorModel model) {
         public ICollectionView PeakSpotsView { get; }
 
         public ReactivePropertySlim<bool> IsEditting { get; }
+        public ReactiveCommand ResetFiltersCommand { get; }
 
         public ReactiveProperty<double> AmplitudeLowerValue { get; }
         public ReactiveProperty<double> AmplitudeUpperValue { get; }
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotTagSearchQueryBuilderViewModel.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotTagSearchQueryBuilderViewModel.cs
index dc0e08f99..96a2b20e3 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotTagSearchQueryBuilderViewModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakSpotTagSearchQueryBuilderViewModel.cs
@@ -38,6 +38,15 @@ public PeakSpotTagSearchQueryBuilderViewModel(PeakSpotTagSearchQueryBuilderModel
         public ReactivePropertySlim<bool> Overannotation { get; }
         public ReactivePropertySlim<bool> Excludes { get; }
 
+        public void Reset() {
+            Confirmed.Value = false;
+            LowQualitySpectrum.Value = false;
+            Misannotation.Value = false;
+            Coelution.Value = false;
+            Overannotation.Value = false;
+            Excludes.Value = false;
+        }
+
         public IObservable<Unit> ObserveChanged { get; }
     }
 }
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/ValueFilterViewModel.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/ValueFilterViewModel.cs
index e8889cb74..268852516 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/ValueFilterViewModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/ValueFilterViewModel.cs
@@ -37,6 +37,10 @@ public ValueFilterViewModel(ValueFilterModel model) {
         public ReactiveProperty<double> Lower { get; }
         public ReactiveProperty<double> Upper { get; }
 
+        public void Reset() {
+            _model.Reset();
+        }
+
         public IObservable<Unit> ObserveChanged { get; }
         public IObservable<bool> ObserveHasErrors { get; }
     }

From 85786cf6e723327b7b5d88e1e8fe2736ae751c3c Mon Sep 17 00:00:00 2001
From: Yuki Matsuzawa <matsuzawa.yuki.8k@kyoto-u.ac.jp>
Date: Thu, 16 Jul 2026 18:09:44 +0900
Subject: [PATCH 2/7] Propagate filter clear controls

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs | 6 ++++--
 .../MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml   | 2 +-
 .../MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml   | 2 +-
 .../MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml   | 2 +-
 .../View/Lcimms/LcimmsAnalysisPeakTableView.xaml            | 2 +-
 .../MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml   | 2 +-
 .../MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs | 3 +++
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
index d5006b191..7c5882819 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
@@ -23,7 +23,7 @@ public sealed class KeywordFilterModel : DisposableModelBase
 
         public KeywordFilterModel(string label, KeywordFilteringType type = KeywordFilteringType.IgnoreIfWordIsNull) {
             _sem = new SemaphoreSlim(1, 1).AddTo(Disposables);
-            _keywords = new List<string>();
+            _keywords = [];
             Keywords = _keywords.AsReadOnly();
             switch (type) {
                 case KeywordFilteringType.ExactMatch:
@@ -33,6 +33,7 @@ public KeywordFilterModel(string label, KeywordFilteringType type = KeywordFilte
                     _method = new KeepIfWordIsNull();
                     break;
                 case KeywordFilteringType.IgnoreIfWordIsNull:
+                case KeywordFilteringType.None:
                 default:
                     _method = new IgnoreIfWordIsNull();
                     break;
@@ -57,13 +58,14 @@ public async Task SetKeywordsAsync(IEnumerable<string> keywords, CancellationTok
         }
 
         public void ClearKeywords() {
-            SetKeywords(Enumerable.Empty<string>());
+            SetKeywords([]);
         }
 
         private void SetKeywords(IEnumerable<string> keywords) {
             _keywords.Clear();
             _keywords.AddRange(keywords);
             IsEnabled = _keywords.Count > 0;
+            OnPropertyChanged(nameof(Keywords));
         }
 
         public bool Match(string word) {
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml
index f429906c4..83d441eb6 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml
@@ -87,7 +87,7 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
+                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      HorizontalAlignment="Stretch"/>
                         </StackPanel>
                     </DataTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml
index 91d5d439a..003f2cd8c 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml
@@ -86,7 +86,7 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
+                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      HorizontalAlignment="Stretch"/>
                         </StackPanel>
                     </DataTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml
index cc2cd3783..67ddc7770 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml
@@ -86,7 +86,7 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
+                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      HorizontalAlignment="Stretch"/>
                         </StackPanel>
                     </DataTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml
index 78f744b49..93118d127 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml
@@ -82,7 +82,7 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
+                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      HorizontalAlignment="Stretch"/>
                         </StackPanel>
                     </DataTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml
index 2b9a6bd33..05290b223 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAnalysisPeakTableView.xaml
@@ -88,7 +88,7 @@
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
                             <Grid>
-                                <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                          HorizontalAlignment="Stretch"/>
                                 <Button Content="&#xE894;"
                                         FontFamily="Segoe MDL2 Assets"
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs
index 9618ee699..56b9b5352 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/KeywordFilterViewModel.cs
@@ -23,6 +23,9 @@ public KeywordFilterViewModel(KeywordFilterModel model) {
                 .SelectSwitch(keywords => Observable.FromAsync(token => model.SetKeywordsAsync(keywords.Split(), token)))
                 .Subscribe()
                 .AddTo(Disposables);
+            model.ObserveProperty(m => m.Keywords)
+                .Subscribe(_ => Keywords.Value = string.Join(" ", model.Keywords))
+                .AddTo(Disposables);
         }
 
         public string Label => _model.Label;

From d0b1f8e64a74e630652b19a3aeced8cd0afba665 Mon Sep 17 00:00:00 2001
From: Yuki Matsuzawa <matsuzawa.yuki.8k@kyoto-u.ac.jp>
Date: Thu, 16 Jul 2026 19:42:22 +0900
Subject: [PATCH 3/7] Reset peak filter toggles

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Model/Search/PeakSpotNavigatorModel.cs             |  3 +++
 .../ViewModel/Search/PeakFilterViewModel.cs            | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs
index 81c8df1d4..781c7a6c5 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/PeakSpotNavigatorModel.cs
@@ -47,6 +47,9 @@ public string? SelectedAnnotationLabel {
         public ObservableCollection<PeakFilterModel> PeakFilters { get; } = new ObservableCollection<PeakFilterModel>();
 
         public void ResetFilters() {
+            foreach (var peakFilterModel in PeakFilters) {
+                peakFilterModel.CheckedFilter = DisplayFilter.Unset;
+            }
             AmplitudeFilterModel.Reset();
             foreach (var valueFilterModel in ValueFilterModels) {
                 valueFilterModel.Reset();
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakFilterViewModel.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakFilterViewModel.cs
index bcb5c045f..2c84e9f0c 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakFilterViewModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/PeakFilterViewModel.cs
@@ -18,7 +18,10 @@ public PeakFilterViewModel(PeakFilterModel model) {
 
             EnabledFilter = model.EnabledFilter;
             CheckedFilter = model.ObserveProperty(m => m.CheckedFilter).ToReactiveProperty().AddTo(Disposables);
-            CheckedFilter.Subscribe(filter => model.CheckedFilter = filter).AddTo(Disposables);
+            CheckedFilter.Subscribe(filter => {
+                model.CheckedFilter = filter;
+                OnPropertyChanged("");
+            }).AddTo(Disposables);
         }
 
         public PeakFilterViewModel(params PeakFilterModel[] models) {
@@ -29,6 +32,7 @@ public PeakFilterViewModel(params PeakFilterModel[] models) {
                 foreach (var m in models) {
                     m.CheckedFilter = filter;
                 }
+                OnPropertyChanged("");
             }).AddTo(Disposables);
         }
 
@@ -111,6 +115,10 @@ public bool MscleanrRmd {
         }
         public bool EnableMscleanrRmd => EnabledFilter.All(DisplayFilter.MscleanrRmd);
 
+        public void Reset() {
+            CheckedFilter.Value = DisplayFilter.Unset;
+        }
+
         private bool ReadFilter(DisplayFilter flag) {
             return (flag & CheckedFilter.Value & EnabledFilter) != 0;
         }

From aad262a5a64161ab27167bf7fc95dd6bdff148a4 Mon Sep 17 00:00:00 2001
From: Yuki Matsuzawa <matsuzawa.yuki.8k@kyoto-u.ac.jp>
Date: Fri, 17 Jul 2026 10:52:54 +0900
Subject: [PATCH 4/7] Add alignment filter reset controls

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml   | 5 +++++
 .../MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml   | 5 +++++
 .../MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml   | 5 +++++
 .../View/Lcimms/LcimmsAlignmentSpotTableView.xaml            | 5 +++++
 .../MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml   | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml
index df3fcc0a1..799d96942 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml
@@ -127,6 +127,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml
index 96a84e952..780323f44 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml
@@ -127,6 +127,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml
index eb6b7f60d..d3f2ba21d 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml
@@ -127,6 +127,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml
index 8a972034f..2baa8804c 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml
@@ -123,6 +123,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml
index e059d4af9..bec172896 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml
@@ -127,6 +127,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 

From 6c20268afef75ab8d5e3fc9b337613ddbcbd2849 Mon Sep 17 00:00:00 2001
From: Yuki Matsuzawa <matsuzawa.yuki.8k@kyoto-u.ac.jp>
Date: Fri, 17 Jul 2026 11:06:38 +0900
Subject: [PATCH 5/7] Add alignment keyword clear affordances

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../View/Dims/DimsAlignmentSpotTableView.xaml | 38 ++++++++++++++++++-
 .../View/Gcms/GcmsAlignmentSpotTableView.xaml | 38 ++++++++++++++++++-
 .../View/Imms/ImmsAlignmentSpotTableView.xaml | 38 ++++++++++++++++++-
 .../Lcimms/LcimmsAlignmentSpotTableView.xaml  | 38 ++++++++++++++++++-
 .../View/Lcms/LcmsAlignmentSpotTableView.xaml | 38 ++++++++++++++++++-
 5 files changed, 180 insertions(+), 10 deletions(-)

diff --git a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml
index 799d96942..a40e95883 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAlignmentSpotTableView.xaml
@@ -86,8 +86,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                   <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml
index 780323f44..27880596e 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentSpotTableView.xaml
@@ -86,8 +86,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                   <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml
index d3f2ba21d..e13338751 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAlignmentSpotTableView.xaml
@@ -86,8 +86,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                   <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml
index 2baa8804c..a80751101 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAlignmentSpotTableView.xaml
@@ -82,8 +82,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                   <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml
index bec172896..71c350ac3 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsAlignmentSpotTableView.xaml
@@ -86,8 +86,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                   <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>

From 53ae73cfac64da99570e69d6478681a9c3d9d665 Mon Sep 17 00:00:00 2001
From: YukiMatsuzawa <122433968+YukiMatsuzawa@users.noreply.github.com>
Date: Fri, 17 Jul 2026 11:41:22 +0900
Subject: [PATCH 6/7] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../MsdialGuiApp/Model/Search/KeywordFilterModel.cs  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs b/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
index 7c5882819..c9d0977f0 100644
--- a/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
+++ b/src/MSDIAL5/MsdialGuiApp/Model/Search/KeywordFilterModel.cs
@@ -57,9 +57,15 @@ public async Task SetKeywordsAsync(IEnumerable<string> keywords, CancellationTok
             }
         }
 
-        public void ClearKeywords() {
-            SetKeywords([]);
-        }
+public void ClearKeywords() {
+    _sem.Wait();
+    try {
+        SetKeywords([]);
+    }
+    finally {
+        _sem.Release();
+    }
+}
 
         private void SetKeywords(IEnumerable<string> keywords) {
             _keywords.Clear();

From 4c6731c936279162b98f8f2b1a13aee62c86950d Mon Sep 17 00:00:00 2001
From: Yuki Matsuzawa <matsuzawa.yuki.8k@kyoto-u.ac.jp>
Date: Fri, 17 Jul 2026 18:36:33 +0900
Subject: [PATCH 7/7] Add remaining peak table clear controls

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../View/Dims/DimsAnalysisPeakTableView.xaml  | 43 ++++++++++++++++++-
 .../View/Gcms/GcmsAnalysisPeakTableView.xaml  | 43 ++++++++++++++++++-
 .../View/Imms/ImmsAnalysisPeakTableView.xaml  | 43 ++++++++++++++++++-
 .../Lcimms/LcimmsAnalysisPeakTableView.xaml   | 43 ++++++++++++++++++-
 4 files changed, 164 insertions(+), 8 deletions(-)

diff --git a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml
index 83d441eb6..3519a3d02 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsAnalysisPeakTableView.xaml
@@ -87,8 +87,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
@@ -128,6 +162,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml
index 003f2cd8c..fe349ca4b 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisPeakTableView.xaml
@@ -86,8 +86,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
@@ -127,6 +161,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml
index 67ddc7770..3847bf3e4 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsAnalysisPeakTableView.xaml
@@ -86,8 +86,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
@@ -127,6 +161,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>
 
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml
index 93118d127..a787ce5e8 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsAnalysisPeakTableView.xaml
@@ -82,8 +82,42 @@
                     <DataTemplate DataType="{x:Type searchvm:KeywordFilterViewModel}">
                         <StackPanel Margin="5,0,0,0">
                             <TextBlock Text="{Binding Label, Mode=OneTime}"/>
-                            <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     HorizontalAlignment="Stretch"/>
+                            <Grid>
+                                <TextBox Text="{Binding Keywords.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         HorizontalAlignment="Stretch"/>
+                                <Button Content="&#xE894;"
+                                        FontFamily="Segoe MDL2 Assets"
+                                        FontSize="6"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,2,0"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        VerticalAlignment="Center"
+                                        HorizontalAlignment="Right"
+                                        Command="{Binding ClearCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}">
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <Border x:Name="border"
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="10">
+                                                <ContentPresenter
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"/>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter TargetName="border"
+                                                            Property="Background"
+                                                            Value="#CCC"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                            </Grid>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
@@ -123,6 +157,11 @@
                         Margin="8,0"
                         VerticalAlignment="Center" HorizontalAlignment="Left"
                         Width="128"/>
+                <Button Content="Reset filter"
+                        Command="{Binding PeakSpotNavigatorViewModel.ResetFiltersCommand, Mode=OneTime, FallbackValue={x:Static commonmvvm:NeverCommand.Instance}}"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Left"
+                        Width="64"/>
             </StackPanel>
         </Grid>