diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb
index 9efbf9e..ec85ada 100644
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -3466,10 +3466,12 @@ Public Class frmConstructor_Main
                 End Try
                 If DTGrid.Columns.Count > 0 Then
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> Datatable Grid created!", False)
+                    'Alle gefundenen Dateien durchlaufen
                     For Each dok As WMObject In windreamSucheErgebnisse
                         Dim fullpath = "W:" & dok.aPath
                         Dim Folderpath = Path.GetDirectoryName(fullpath)
                         Dim filename = Path.GetFileName(fullpath)
+                        Dim extension = Path.GetExtension(fullpath)
                         Try
                             Dim NewRow As DataRow
                             NewRow = DTGrid.NewRow()
@@ -3478,7 +3480,12 @@ Public Class frmConstructor_Main
                                 Dim Indexname = DT.Rows(0).Item(Column)
                                 Dim idxvalue
                                 Try
-                                    idxvalue = dok.GetVariableValue(Indexname)
+                                    If Indexname.ToString.ToUpper = "Dateiname".ToUpper Then
+                                        idxvalue = filename
+                                    Else
+                                        'windream-Indexwert holen
+                                        idxvalue = dok.GetVariableValue(Indexname)
+                                    End If
                                     If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False)
                                 Catch ex As Exception
                                     ClassLogger.Add("Unexpected Error in GetVariableValue for Index '" & Indexname & "- Error: " & ex.Message)