diff --git a/app/DD-Record-Organiser/ClassControlLoader.vb b/app/DD-Record-Organiser/ClassControlLoader.vb
index 20cd737..45463b0 100644
--- a/app/DD-Record-Organiser/ClassControlLoader.vb
+++ b/app/DD-Record-Organiser/ClassControlLoader.vb
@@ -401,14 +401,9 @@
 
             ' SQLCommand ignorieren
             If dynamic.StaticList IsNot Nothing Then
-                Dim bindingSource As New BindingSource()
-
-                For Each item As String In dynamic.StaticList
-                    bindingSource.Add(item)
-                Next
-
-                'control.DataSource = dynamic.StaticList
-                control.DataSource = bindingSource
+                control.DataSource = dynamic.StaticList.Select(Function(v)
+                                                                   Return New With {Key .Value = v}
+                                                               End Function)
             End If
 
         End Sub
diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb
index 619a644..f02e932 100644
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@@ -257,7 +257,7 @@ Public Class ClassControlValues
 
             ' Zuerst alle SQL Commands für FormID finden
             ' CONTROL_SQLCOMMAND_1 wird als SQL gealiast
-            Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1,CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 <> '' AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%'", FormID)
+            Dim SQL As String = String.Format("SELECT CONTROL_ID, CONTROL_CONNID_1,CONTROL_SQLCOMMAND_1 AS SQL FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0} AND CONTROL_SQLCOMMAND_1 NOT LIKE '%@%'", FormID)
             Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
 
             swsql.Stop()