diff --git a/app/DD-Record-Organiser/ClassHelper.vb b/app/DD-Record-Organiser/ClassHelper.vb
index 3d124c6..b6a7047 100644
--- a/app/DD-Record-Organiser/ClassHelper.vb
+++ b/app/DD-Record-Organiser/ClassHelper.vb
@@ -166,7 +166,7 @@ Public Class ClassHelper
         Try
             Dim listcheck As New List(Of String)
             ' Alle Checkboxen für aktuelle Ansicht heraussuchen
-            Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & ENTITY_ID
+            Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & ENTITY_ID
             Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
             'Liste von allen Spaltentiteln mit Checkbox erstellen
             If dtcheck.Rows.Count > 0 Then
@@ -184,7 +184,7 @@ Public Class ClassHelper
         Try
             Dim listdate As New List(Of String)
             ' Alle Checkboxen für aktuelle Ansicht heraussuchen
-            Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND FORM_ID = " & ENTITY_ID
+            Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & ENTITY_ID
             Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
             'Liste von allen Spaltentiteln mit Checkbox erstellen
             If dtdate.Rows.Count > 0 Then
diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb
index 5abc82c..d3437b2 100644
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -566,7 +566,15 @@ Public Class frmConstructor_Main
                 If btn.IsMain Then
                     ResetNav()
                 ElseIf btn.Name = "NavButtonRefresh" Then
-                    Load_Datafor_Entity()
+                    If TrySave_Automatic() = True Then
+                        ' Setzt die RECORD_ID auf Null
+                        ' damit beim Refresh keine alten Werte
+                        ' in die Datenbank geschrieben werden
+                        SELECTED_RECORD_ID = 0
+                        RECORD_ID = 0
+                        CURRENT_RECORD_ID = 0
+                        Load_Datafor_Entity()
+                    End If
                 End If
 
             Else