diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb
index 8271230..cb2d96f 100644
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@@ -772,6 +772,8 @@ Public Class ClassControlBuilder
             control.Parent = _master_panel
             control.DropDownStyle = ComboBoxStyle.DropDown
             control.FormattingEnabled = True
+            control.AutoCompleteMode = AutoCompleteMode.Append
+            control.AutoCompleteSource = AutoCompleteSource.ListItems
 
             If (Not _designMode And read_only) Then
                 control.Enabled = Not read_only
diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb
index 57cab58..af9102d 100644
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@@ -152,8 +152,8 @@ Public Class ClassControlValues
                     LoadControlValue_forControl(RecordID, FormID, DirectCast(control, ComboBox), CONTROL_ID)
                     'LoadControlValues(RecordID, FormID, DirectCast(control, ComboBox).Controls)
                 ElseIf TypeOf control Is GroupBox Then
-                    LoadControlValue_forControl(RecordID, FormID, DirectCast(control, GroupBox), CONTROL_ID)
-                    ' LoadControlValues(RecordID, FormID, DirectCast(control, GroupBox).Controls)
+                    'LoadControlValue_forControl(RecordID, FormID, DirectCast(control, GroupBox), CONTROL_ID)
+                    LoadControlValues(RecordID, FormID, DirectCast(control, GroupBox).Controls)
                 ElseIf TypeOf control Is PictureBox Then
                     LoadImage(RecordID, CONTROL_ID, control)
                 Else
@@ -393,10 +393,10 @@ Public Class ClassControlValues
         End Try
 
     End Sub
+
     Public Shared Sub LoadControlValuesList(RecordID As Integer, FormID As Integer, controls As Control.ControlCollection)
         Try
             For Each Ctrl As Control In controls
-
                 If TypeOf Ctrl Is ComboBox Then
                     Dim Combobox = DirectCast(Ctrl, ComboBox)
 
@@ -418,9 +418,10 @@ Public Class ClassControlValues
                             Combobox.DataSource = DT_Combobox
                             Combobox.DisplayMember = DT_Combobox.Columns(1).ColumnName
                             Combobox.ValueMember = DT_Combobox.Columns(0).ColumnName
-                            Combobox.AutoCompleteMode = AutoCompleteMode.Append
-                            Combobox.AutoCompleteSource = AutoCompleteSource.ListItems
+                            'Combobox.AutoCompleteMode = AutoCompleteMode.Append
+                            'Combobox.AutoCompleteSource = AutoCompleteSource.ListItems
                         End If
+
                         Dim iWidestWidth As Integer = 300
                         For Each row As DataRow In DT_Combobox.Rows
                             'Die BReite der DropDown-Lsit anpassen
@@ -432,15 +433,17 @@ Public Class ClassControlValues
                             End Using
                             '    control.Items.Add(row.Item(0).ToString)
                         Next
+
                         If iWidestWidth > 300 Then
                             Combobox.DropDownWidth = Math.Max(iWidestWidth, Combobox.Width)
                         End If
+
                         LoadControlValue(RecordID, GetControlID_for_Name(Combobox.Name, FormID), Ctrl)
 
                     End If
-
                 End If
 
+
             Next
         Catch ex As Exception
             MsgBox("Unexpected Error in LoadControlValuesList:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb
index 5ea390d..3b54775 100644
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb
@@ -1022,6 +1022,7 @@ Public Class frmForm_Constructor_Main_2
                 NEW_RECORD_ID = 0
                 If Not RECORD_CHANGED Then
                     Update_Status_Label(True, "KEINE Änderungen an Datensatz.")
+                    Me.Cursor = Cursors.Default
                     Exit Sub
                 End If
             End If