diff --git a/LarkatorGUI/DummyMainWindow.cs b/LarkatorGUI/DummyMainWindow.cs
index 3cb0388..659ce1c 100644
--- a/LarkatorGUI/DummyMainWindow.cs
+++ b/LarkatorGUI/DummyMainWindow.cs
@@ -9,6 +9,8 @@ public class DummyMainWindow
     {
         public string ApplicationVersion { get => "DUMMY"; }
 
+        public string SearchText { get; set; } = "search";
+
         public Collection<SearchCriteria> ListSearches { get => searches; }
         public Collection<DinoViewModel> ListResults { get => results; }
 
diff --git a/LarkatorGUI/LarkatorGUI.csproj b/LarkatorGUI/LarkatorGUI.csproj
index 321a131..4501ade 100644
--- a/LarkatorGUI/LarkatorGUI.csproj
+++ b/LarkatorGUI/LarkatorGUI.csproj
@@ -46,6 +46,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -55,6 +56,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>compass.ico</ApplicationIcon>
diff --git a/LarkatorGUI/MainWindow.xaml b/LarkatorGUI/MainWindow.xaml
index 6df370f..e0b2800 100644
--- a/LarkatorGUI/MainWindow.xaml
+++ b/LarkatorGUI/MainWindow.xaml
@@ -45,12 +45,19 @@
             </CollectionViewSource.SortDescriptions>
         </CollectionViewSource>
 
+        <Style x:Key="ClearTextBox" TargetType="{x:Type TextBox}">
+            <Setter Property="Foreground" Value="AntiqueWhite"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="BorderBrush" Value="{x:Null}"/>
+        </Style>
+
         <Style x:Key="CleanRowStyle" TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource {x:Type DataGridRow}}">
             <Setter Property="Background" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
             <Style.Triggers>
                 <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="{StaticResource SelectionBackgroundBrush}" />
+                    <Setter Property="Background" Value="#4884" />
                 </Trigger>
             </Style.Triggers>
         </Style>
@@ -285,7 +292,22 @@
                 </DataGrid>
 
                 <StackPanel Grid.Row="2" Orientation="Vertical">
-                    <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="16" Content="+" Click="CreateSearch_Click" Visibility="{Binding CreateSearchAvailable, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8" Visibility="{Binding ShowTames, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <Border BorderThickness="0,0,0,1" BorderBrush="#4FFF">
+                            <StackPanel Orientation="Horizontal" TextBlock.FontSize="{Binding Source={StaticResource Settings}, Path=Default.ListFontSize}">
+                                <TextBox x:Name="searchText" Width="140" AcceptsReturn="False" Style="{StaticResource ClearTextBox}"
+                                         Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" PreviewKeyDown="SearchText_KeyDown"
+                                         VerticalContentAlignment="Bottom" Padding="2,0,2,2" local:FontSizeHelper.RelativeFontSize="+2"/>
+                                <Button Click="ClearSearch_Click" BorderBrush="{x:Null}" BorderThickness="0" Background="{x:Null}"
+                                        Margin="4,4,8,3" Padding="3,0" ToolTip="Clear search term">
+                                    <fa:ImageAwesome Icon="Close" Width="10" Foreground="AntiqueWhite" Opacity="0.6"/>
+                                </Button>
+                            </StackPanel>
+                        </Border>
+                        <fa:ImageAwesome Icon="Search" Width="24" Foreground="AntiqueWhite" Margin="8,0,0,0" Opacity="0.6" MouseDown="Search_Click"/>
+                    </StackPanel>
+                    <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="16" Content="+" Click="CreateSearch_Click"
+                            Visibility="{Binding CreateSearchAvailable, Converter={StaticResource BoolToVisibilityConverter}}"/>
                     <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
                         <StackPanel Margin="8" Orientation="Vertical" HorizontalAlignment="Stretch" DataContext="{Binding NewSearch}">
                             <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True"/>
@@ -335,7 +357,7 @@
                 <DataGrid Grid.Row="1" x:Name="resultsList" Margin="8" AutoGenerateColumns="False" IsReadOnly="True"
                           ItemsSource="{Binding Source={StaticResource OrderedResults}}"
                           TextBlock.FontSize="{Binding Default.ListFontSize, Source={StaticResource Settings}}"
-                          SelectionMode="Single" SelectionUnit="FullRow" CanUserSortColumns="True" Sorting="ResultList_Sorting"
+                          SelectionMode="Extended" SelectionUnit="FullRow" CanUserSortColumns="True" Sorting="ResultList_Sorting"
                           Style="{DynamicResource CleanDataGridStyle}" RowStyle="{DynamicResource CleanDinoRowStyle}"
                           ColumnHeaderStyle="{DynamicResource CleanColumnHeaderStyle}" CellStyle="{DynamicResource CleanCellStyle}"
                           >
diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
index 9bed821..ab8bbce 100644
--- a/LarkatorGUI/MainWindow.xaml.cs
+++ b/LarkatorGUI/MainWindow.xaml.cs
@@ -96,6 +96,15 @@ public ImageSource ImageSource
             set { SetValue(ImageSourceProperty, value); }
         }
 
+        public string SearchText
+        {
+            get { return (string)GetValue(SearchTextProperty); }
+            set { SetValue(SearchTextProperty, value); }
+        }
+
+        public static readonly DependencyProperty SearchTextProperty =
+            DependencyProperty.Register("SearchText", typeof(string), typeof(MainWindow), new PropertyMetadata(""));
+
         public static readonly DependencyProperty ImageSourceProperty =
             DependencyProperty.Register("ImageSource", typeof(ImageSource), typeof(MainWindow), new PropertyMetadata(null));
 
@@ -131,6 +140,9 @@ public ImageSource ImageSource
         private List<MapCalibration> mapCalibrations;
         private readonly string appVersion;
         readonly List<bool?> nullableBoolValues = new List<bool?> { null, false, true };
+        DateTime nameSearchTime;
+        string nameSearchArg;
+        bool nameSearchRunning;
 
         public MainWindow()
         {
@@ -163,6 +175,8 @@ public MainWindow()
             var cmdThrowExceptionAndExit = new RoutedCommand();
             cmdThrowExceptionAndExit.InputGestures.Add(new KeyGesture(Key.F2, ModifierKeys.Control));
             CommandBindings.Add(new CommandBinding(cmdThrowExceptionAndExit, (o, e) => Dev_GenerateException_Click(null, null)));
+
+            DependencyPropertyDescriptor.FromProperty(SearchTextProperty, typeof(MainWindow)).AddValueChanged(DataContext, (s,e) => TriggerNameSearch());
         }
 
         private static string CalculateApplicationVersion()
@@ -320,6 +334,24 @@ private void RemoveSearch_Click(object sender, RoutedEventArgs e)
             MarkSearchesChanged();
         }
 
+        private void ClearSearch_Click(object sender, RoutedEventArgs e)
+        {
+            SearchText = "";
+
+            TriggerNameSearch(true);
+        }
+
+        private void Search_Click(object sender, MouseButtonEventArgs e)
+        {
+            TriggerNameSearch(true);
+        }
+
+        private void SearchText_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+                TriggerNameSearch(true);
+        }
+
         private void MapPin_Click(object sender, MouseButtonEventArgs ev)
         {
             if (sender is FrameworkElement e && e.DataContext is DinoViewModel dvm)
@@ -522,7 +554,7 @@ private void Result_MouseEnter(object sender, MouseEventArgs e)
             if (fe == null) return;
             var dino = fe.DataContext as DinoViewModel;
             if (dino == null) return;
-            dino.Highlight = true;
+            //dino.Highlight = true;
         }
 
         private void Result_MouseLeave(object sender, MouseEventArgs e)
@@ -531,7 +563,7 @@ private void Result_MouseLeave(object sender, MouseEventArgs e)
             if (fe == null) return;
             var dino = fe.DataContext as DinoViewModel;
             if (dino == null) return;
-            dino.ClearValue(DinoViewModel.HighlightProperty);
+            //dino.ClearValue(DinoViewModel.HighlightProperty);
         }
 
         private void ResultList_Sorting(object sender, DataGridSortingEventArgs e)
@@ -660,6 +692,8 @@ private void UpdateSearchResults(IList<SearchCriteria> searches)
             }
 
             ((CollectionViewSource)Resources["OrderedResults"]).View.Refresh();
+
+            TriggerNameSearch(true);
         }
 
         private async Task PerformConversion(bool force)
@@ -769,6 +803,8 @@ private void SetupTamedSearches()
             ListSearches.Clear();
             foreach (var search in searches)
                 ListSearches.Add(search);
+
+            TriggerNameSearch(true);
         }
 
         private void ShowWildSearches()
@@ -806,5 +842,40 @@ private void RefreshDataGridColumnWidths(string resourceName, DataGrid dataGrid)
             foreach (var o in dataGrid.Columns.Zip(widths, (col, width) => new { col, width }))
                 o.col.Width = o.width;
         }
+
+        private void TriggerNameSearch(bool immediate=false)
+        {
+            nameSearchTime = DateTime.Now + TimeSpan.FromSeconds(immediate ? 0.01 : 0.5);
+            nameSearchArg = SearchText;
+
+            if (!nameSearchRunning)
+            {
+                nameSearchRunning = true;
+                Dispatcher.Invoke(WaitForNameSearch, DispatcherPriority.Background);
+            }
+        }
+
+        private async Task WaitForNameSearch()
+        {
+            while (nameSearchTime > DateTime.Now)
+            {
+                await Task.Delay(100);
+            }
+
+            nameSearchRunning = false;
+            
+            var searchText = nameSearchArg.Trim();
+
+            if (String.IsNullOrWhiteSpace(searchText) || searchText.Length < 2)
+            {
+                foreach (var dvm in ListResults)
+                    dvm.Highlight = false;
+            }
+            else
+            {
+                foreach (var dvm in ListResults)
+                    dvm.Highlight = (dvm.Dino.Name != null) && dvm.Dino.Name.Contains(searchText);
+            }
+        }
     }
 }