diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
index 2b64fa4..639a659 100644
--- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
@@ -170,16 +170,16 @@ Public Class ClassWindreamDocGrid
                                                "FROM TBPMO_DOC_VALUES T RIGHT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND LANGUAGE = '{1}' AND T1.CONFIG_COLUMNS = 1", CURRENT_ENTITY_ID, USER_LANGUAGE)
             Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(DT_DETAILS_SQL, True)
 
-            ' ' '
 
+            ' Werte für Konfigurierte Spalten aus TBPMO_DOC_VALUES auslesen und Zellenweise einfügen
             For Each row As DataRow In DT_RESULT.Rows
                 For Each col As DataColumn In DT_RESULT.Columns
                     Dim colName As String = col.ColumnName
                     Dim docId As Integer = row.Item("DocID")
                     Dim configId As Integer = RESULT_CONFIG_IDS.Item(col.ColumnName)
 
-                    If Not IsNothing(configId) Then
-                        Dim value As String
+                    If configId <> 0 Then
+                        Dim value As String = ""
 
                         Try
                             value = ClassDatabase.Execute_Scalar(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1}", configId, docId))
@@ -187,16 +187,11 @@ Public Class ClassWindreamDocGrid
                             ClassLogger.Add(String.Format(">> Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message, False)
                         End Try
 
-                        ' Überprüfung, ob die Spalte zu CONFIG_COLUMNS gehört..
-                        If Not IsNothing(value) Then
-                            row.Item(colName) = value
-                        End If
+                        row.Item(colName) = value
                     End If
                 Next
             Next
 
-            ' ' '
-
             ' Tabellen zum DataSet hinzufügen
             ds.Tables.Add(DT_RESULT)
             ds.Tables.Add(DT_DETAILS)
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index cd72821..7e85963 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -2146,7 +2146,7 @@ Public Class frmConstructor_Main
                 tsbtnGeodata.Visible = False
             End If
             ACTIVATE_DOC_SEARCH_ON_EDIT = result.Item("ACTIVATE_DOC_SEARCH_ON_EDIT")
-            sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND CONFIG_COLUMNS = 0", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
+            sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
             DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql, True)
             sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
             DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)