diff --git a/app/DD_PM_WINDREAM/ClassSQLEditor.vb b/app/DD_PM_WINDREAM/ClassSQLEditor.vb
index 88c08d6..fff9ccb 100644
--- a/app/DD_PM_WINDREAM/ClassSQLEditor.vb
+++ b/app/DD_PM_WINDREAM/ClassSQLEditor.vb
@@ -20,6 +20,10 @@ Public Class ClassSQLEditor
             Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM)
                 oForm.SQLCommand = SQLSTring
 
+                oForm.PlaceholdersManualPrefix = "CTRL"
+                oForm.PlaceholdersManualTitle = "Controls"
+                oForm.PlaceholdersManual = CURRENT_CONTROL_LIST.ToDictionary(Function(control) control.Name, Function(control) control.Name)
+
                 If svc.ShowDialog(oForm) = DialogResult.OK Then
                     Dim sql As New SQLValue(oForm.SQLCommand)
                     CURRENT_SQL_CON = oForm.SQLConnection
diff --git a/app/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx
index 41c69df..b93fedb 100644
--- a/app/DD_PM_WINDREAM/My Project/licenses.licx	
+++ b/app/DD_PM_WINDREAM/My Project/licenses.licx	
@@ -1,10 +1,11 @@
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 9139193..ae8478d 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -292,6 +292,8 @@ Public Class frmFormDesigner
                         SetMovementHandlers(oButton)
                 End Select
             Next
+
+            CURRENT_CONTROL_LIST = pnldesigner.Controls.Cast(Of Control).ToList()
         Catch ex As Exception
             LOGGER.Error(ex)
             MsgBox("Fehler bei LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")