diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx
index feb52ca..578ddbd 100644
--- a/Global_Indexer/frmConfig_Basic.resx
+++ b/Global_Indexer/frmConfig_Basic.resx
@@ -912,7 +912,7 @@ ausgenommen werden sollen:</value>
     <value>3</value>
   </data>
   <data name="btnFW_OwnFiles.Text" xml:space="preserve">
-    <value>Ordner 'SimpleIndexer' in Eigenen Dateien erzeugen</value>
+    <value>Ordner 'GlobalIndexer' in Eigenen Dateien erzeugen</value>
   </data>
   <data name="&gt;&gt;btnFW_OwnFiles.Name" xml:space="preserve">
     <value>btnFW_OwnFiles</value>
@@ -936,7 +936,7 @@ ausgenommen werden sollen:</value>
     <value>2</value>
   </data>
   <data name="btnFW_Desktop.Text" xml:space="preserve">
-    <value>Ordner 'SimpleIndexer' auf Desktop erzeugen</value>
+    <value>Ordner 'GlobalIndexer' auf Desktop erzeugen</value>
   </data>
   <data name="&gt;&gt;btnFW_Desktop.Name" xml:space="preserve">
     <value>btnFW_Desktop</value>
diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb
index f314361..8d010ea 100644
--- a/Global_Indexer/frmConfig_Basic.vb
+++ b/Global_Indexer/frmConfig_Basic.vb
@@ -224,7 +224,7 @@ Public Class frmConfig_Basic
     End Sub
 
     Private Sub btnFW_Desktop_Click(sender As Object, e As EventArgs) Handles btnFW_Desktop.Click
-        CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "SimpleIndexer")
+        CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "GlobalIndexer")
         CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT")
     End Sub
     Sub CheckFolder(mypath As String, FOLDER_TYPE As String)
@@ -293,7 +293,7 @@ Public Class frmConfig_Basic
     End Sub
 
     Private Sub btnFW_OwnFiles_Click(sender As Object, e As EventArgs) Handles btnFW_OwnFiles.Click
-        CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "SimpleIndexer")
+        CURRENT_FOLDERWATCH = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "GlobalIndexer")
         CheckFolder(CURRENT_FOLDERWATCH, "DEFAULT")
     End Sub
 
diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 083b903..1e00fbd 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1372,6 +1372,8 @@ Public Class frmIndex
                         MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:")
                     End Try
             End Select
+        Else
+            INDEXING_ACTIVE = False
         End If
     End Sub
     Private Sub frmIndex_Load(sender As Object, e As System.EventArgs) Handles Me.Load
@@ -1949,30 +1951,6 @@ Public Class frmIndex
                             'Die Datei verschieben
                             If Move_File2_Target() = True Then
                                 _Logger.Debug(" ...Move_File2_Target durchlaufen")
-                                ''Die Originaldatei löschen
-                                'If DropType = "|DROPFROMFSYSTEM|" Then
-                                '    If CURR_DELETE_ORIGIN = True Then
-                                '        'Die temporäre Datei löschen
-                                '        DeleteFile()
-                                '    End If
-                                'ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
-                                '    'Die temporäre Datei löschen
-                                '    If CURRENT_WORKFILE.EndsWith("pdf") Then
-                                '        DocumentViewer1.Done()
-                                '        DocumentViewer1.CloseDocument()
-                                '    End If
-
-                                '    DeleteFile()
-                                'ElseIf (DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Or DropType = "|MSGONLY|") Then
-                                '    'Die temporäre Datei löschen
-                                '    DeleteFile()
-
-                                'ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
-                                '    'Die temporäre Datei löschen
-                                '    DeleteFile()
-
-                                'End If
-
                                 CURRENT_LASTDOKART = cmbDokumentart.Text
                                 _Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
                                 Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID
@@ -2038,14 +2016,7 @@ Public Class frmIndex
                         CURRENT_WORKFILE_GUID = filerow.Item("GUID")
                         CURRENT_WORKFILE = filerow.Item("FILENAME2WORK")
                         DropType = filerow.Item("HANDLE_TYPE")
-                        'Dim HandleType As String = filerow.Item("HANDLE_TYPE")
-                        'If HandleType = "|DROPFROMFSYSTEM|" Then
-                        '    DropType = "dragdrop file"
-                        'ElseIf HandleType = "|OUTLOOK_ATTMNT|" Then
-                        '    DropType = "dragdrop attachment"
-                        'ElseIf HandleType = "|OUTLOOKMESSAGE|" Then
-                        '    DropType = "dragdrop message"
-                        'End If
+
                         If WORK_FILE() = False Then
                             err = True
                             Exit For
@@ -2059,7 +2030,6 @@ Public Class frmIndex
                             MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
                         End If
 
-                        'DTACTUAL_FILES.Clear()
                         Me.Close()
                     End If
                 End If