diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 641e7c9..031f35b 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1738,6 +1738,7 @@ Public Class frmIndex
                         _Logger.Info("Setting Last Saved DocType: {0}", CURRENT_LASTDOKART)
 
                         ComboboxDoctype.EditValue = oFoundDocType
+                        ComboboxDoctype.SelectNextControl(ComboboxDoctype, forward:=True, tabStopOnly:=True, nested:=True, wrap:=False)
                     End If
 
                 End If
@@ -1762,12 +1763,18 @@ Public Class frmIndex
                         If oFoundDocType IsNot Nothing Then
                             _Logger.Debug("DocType found: [{0}]", oFoundDocType)
                             ComboboxDoctype.EditValue = oFoundDocType
+                            ComboboxDoctype.SelectNextControl(ComboboxDoctype, forward:=True, tabStopOnly:=True, nested:=True, wrap:=False)
 
                             Exit For
                         End If
                     End If
                 Next
             End If
+
+
+            If ComboboxDoctype.EditValue Is Nothing Then
+                ComboboxDoctype.Select()
+            End If
         Catch ex As Exception
             ShowErrorMessage(ex, "Form Shown")
         End Try
diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs
index ffaf6bd..b3fd38b 100644
--- a/SetupVS19/Product.wxs
+++ b/SetupVS19/Product.wxs
@@ -112,7 +112,6 @@
 				<File Id="Base" Name="DigitalData.Modules.Base.dll" Source="DigitalData.Modules.Base.dll" KeyPath="no" />
 				<File Id="Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
 				<File Id="Database" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll" KeyPath="no" />
-				<File Id="Language" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll" KeyPath="no" />
 				<File Id="License" Name="DigitalData.Modules.License.dll" Source="DigitalData.Modules.License.dll" KeyPath="no" />
 				<File Id="Logging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="yes" />
 				<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />