diff --git a/src/MyNet.Wpf.Presentation/MyNet.Wpf.Presentation.csproj b/src/MyNet.Wpf.Presentation/MyNet.Wpf.Presentation.csproj
index 9965222..a9e6f08 100644
--- a/src/MyNet.Wpf.Presentation/MyNet.Wpf.Presentation.csproj
+++ b/src/MyNet.Wpf.Presentation/MyNet.Wpf.Presentation.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>A comprehensive collection of controls, graphical elements, and views designed for accelerating WPF application development.</Description>
     <PackageTags>MyNet;UI;Xaml;Presentation;Wpf</PackageTags>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.2.1</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/MyNet.Wpf.Presentation/Views/Export/ExportView.xaml b/src/MyNet.Wpf.Presentation/Views/Export/ExportView.xaml
index c3b3c7c..a632414 100644
--- a/src/MyNet.Wpf.Presentation/Views/Export/ExportView.xaml
+++ b/src/MyNet.Wpf.Presentation/Views/Export/ExportView.xaml
@@ -27,7 +27,7 @@
 
     <my:ContentDialog.Footer>
         <my:SimpleStackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-            <ToggleButton Style="{StaticResource MyNet.Styles.ToggleButton.Switch}" Content="{my:Resource SaveConfiguration}" IsChecked="{Binding SaveConfiguration}" />
+            <ToggleButton Style="{StaticResource MyNet.Styles.ToggleButton.Switch}" Content="{my:Resource SaveConfiguration}" IsChecked="{Binding SaveConfigurationOnValidate}" />
             <Button Style="{StaticResource MyNet.Styles.Button.Reset}" HorizontalAlignment="Right" Command="{Binding ResetCommand}" />
             <Button Style="{StaticResource MyNet.Styles.Button.Cancel}" HorizontalAlignment="Right" Command="{Binding CancelCommand}" />
             <Button Style="{StaticResource MyNet.Styles.Button.Validate}" HorizontalAlignment="Right" Command="{Binding ExportAndCloseCommand}" />
@@ -104,7 +104,6 @@
                     </my:SimpleStackPanel>
                 </Grid>
                 <ListView Grid.Row="4"
-                          dd:DragDrop.DropHandler="{Binding DropHandler}"
                           dd:DragDrop.IsDragSource="True"
                           dd:DragDrop.IsDropTarget="True"
                           dd:DragDrop.UseDefaultDragAdorner="True"
@@ -133,7 +132,7 @@
                             <GridViewColumn my:GridViewColumnAssist.Width="*" Header="{my:Resource ColumnHeader}">
                                 <GridViewColumn.CellTemplate>
                                     <DataTemplate>
-                                        <TextBlock x:Name="text" Text="{Binding Item.DisplayName.Value}" />
+                                        <TextBlock x:Name="text" Text="{Binding Item.Value}" />
                                         <DataTemplate.Triggers>
                                             <DataTrigger Binding="{Binding IsSelected}" Value="False">
                                                 <Setter TargetName="text" Property="Opacity" Value="{StaticResource MyNet.Opacity.Secondary}" />
diff --git a/src/MyNet.Wpf/MyNet.Wpf.csproj b/src/MyNet.Wpf/MyNet.Wpf.csproj
index bff8e82..c081419 100644
--- a/src/MyNet.Wpf/MyNet.Wpf.csproj
+++ b/src/MyNet.Wpf/MyNet.Wpf.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="MaterialDesignThemes" Version="5.0.1-ci633" />
     <PackageReference Include="MyNet.Humanizer" Version="1.0.0" />
     <PackageReference Include="MyNet.Observable" Version="1.2.0" />
-    <PackageReference Include="MyNet.UI" Version="3.0.0" />
+    <PackageReference Include="MyNet.UI" Version="3.1.0" />
     <PackageReference Include="MyNet.Xaml.Html" Version="1.0.0" />
     <PackageReference Include="MyNet.Xaml.Merger.MSBuild" Version="2.0.1">
       <PrivateAssets>all</PrivateAssets>