diff --git a/app/DD-Record-Organiser/ClassDatabase.vb b/app/DD-Record-Organiser/ClassDatabase.vb
index 02e1b40..c897a3a 100644
--- a/app/DD-Record-Organiser/ClassDatabase.vb
+++ b/app/DD-Record-Organiser/ClassDatabase.vb
@@ -83,7 +83,7 @@ Public Class ClassDatabase
             Dim match As System.Text.RegularExpressions.Match = regex.Match(sql)
 
             If match.Success Then
-                Return Nothing
+                'Return Nothing
             End If
 
             Dim connectionString As String
diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx
index e3e8722..0374d6b 100644
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@@ -363,6 +363,9 @@
   <data name="TCDetails.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 25</value>
   </data>
+  <data name="pnlDetails.AutoScroll" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="pnlDetails.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb
index 26d3bc3..c54c14a 100644
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -745,6 +745,9 @@ Public Class frmConstructor_Main
                 Check_Record_Changed()
                 DisableEditMode()
                 VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True
+                ' muss vor show selected record data kommen,
+                ' sodass die datasource für die angehakten werte existiert (checked list box)
+                ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, Grid_RecordID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
                 Show_Selected_Record_Data(Grid_RecordID, False)
 
                 RIGHT_ONLY_READ = False
@@ -1487,7 +1490,7 @@ Public Class frmConstructor_Main
 
         ' Abhängige Listen laden
         CtrlBuilder.WatchRecordChanges = False
-        ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
+        'ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
         ClassControlValues.Enable_Depending_Controls(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
         CtrlBuilder.WatchRecordChanges = True