diff --git a/app/DD-Record-Organizer/ClassHelper.vb b/app/DD-Record-Organizer/ClassHelper.vb
index 55a63bc..44a6e73 100644
--- a/app/DD-Record-Organizer/ClassHelper.vb
+++ b/app/DD-Record-Organizer/ClassHelper.vb
@@ -4,13 +4,17 @@ Imports DD_LIB_Standards
 Public Class ClassHelper
     Public Shared Function FORMAT_WM_PATH(WMpath As String)
         Try
+            Dim ochanged As Boolean = False
             If WMpath.StartsWith("W:") Then
                 WMpath = WMpath.Replace("W:", "\\windream\Objects")
+                ochanged = True
             ElseIf WMpath.StartsWith("\") Then
                 If WMpath.StartsWith("\\windream\Objects") = False Then
                     WMpath = "\\windream\Objects" & WMpath
+                    ochanged = True
                 End If
             End If
+            If LogErrorsOnly = False And ochanged = True Then ClassLogger.Add(" >> WMpath is: " & WMpath, False)
             Return WMpath
         Catch ex As Exception
             Return WMpath
@@ -154,7 +158,7 @@ Public Class ClassHelper
     Public Shared Sub File_open(RESULT_DOC_PATH As Object, DocID As String)
         Try
             RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH)
-
+            CURRENT_OFFICE_FILE_CHANGED = False
             If RESULT_DOC_PATH <> Nothing Then
                 If USER_GENERAL_VIEWER = "NONE" Then
                     Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
@@ -216,19 +220,54 @@ Public Class ClassHelper
     Private Shared Sub File_SYSOPEN(RESULT_DOC_PATH As Object, DocID As String)
         Try
             If RESULT_DOC_PATH <> Nothing Then
-                If System.IO.File.Exists(RESULT_DOC_PATH) = True Then
-                    Process.Start(RESULT_DOC_PATH)
-                Else
-                    If clsWD_GET.WDFile_exists(RESULT_DOC_PATH, clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = False Then
-                        MSGBOX_Handler("ERROR", "File not found (1):", "File '" & RESULT_DOC_PATH & "' not existing or Windream-Malfunction...." & vbNewLine &
-                                       " - Maybe You are not provided with reading rights?!" & vbNewLine &
-                                       " - Check Your windream-drive: is W accessible? Can You navigate to the filepath?" & vbNewLine & "Please inform Your admin!")
-                    Else
-                        MSGBOX_Handler("ERROR", "File not found (2):", "File '" & RESULT_DOC_PATH & "' exists in windream BUT is not accessible!" & vbNewLine &
-                                       " - Maybe You are not provided with reading rights?!" & vbNewLine &
-                                       " - Check Your windream-drive: is W accessible? Can You navigate to the filepath?" & vbNewLine & "Please inform Your admin!")
+                Try
+                    Dim oMyProcess = New Process()
+                    Try
+                        Dim oPSI As New ProcessStartInfo(RESULT_DOC_PATH)
+
+                        oMyProcess.StartInfo.FileName = RESULT_DOC_PATH
+                        oMyProcess.StartInfo.UseShellExecute = True
+                        oMyProcess.StartInfo.RedirectStandardOutput = False
+                        oMyProcess.Start()
+                        oMyProcess.WaitForExit()
+                    Catch ex As Exception
+                        ClassLogger.Add("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+                        Exit Sub
+                    End Try
+
+
+
+                    Dim oExtension = Path.GetExtension(RESULT_DOC_PATH).ToLower
+                    If LogErrorsOnly = False Then ClassLogger.Add($"Checking oExtension [{oExtension}]...", False)
+                    If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
+                        Dim osql = $"SELECT Count(DocID) FROM VWPMO_DOC_SYNC WHERE DocID = {DocID}"
+                        Dim oFileExists = clsDatabase.Execute_Scalar(osql, False)
+                        If oFileExists = 0 Then
+                            CURRENT_OFFICE_FILE_CHANGED = True
+                            ClassLogger.Add("The docId of handled file changed during editing mode!- OldDocID: " & DocID, False)
+                            osql = $"SELECT dwDocID FROM windream60.dbo.BaseAttributes WHERE dwVersionID = {DocID}"
+                            Dim oNEW_DOC As DataTable = clsDatabase.Return_Datatable(osql, False)
+                            If oNEW_DOC.Rows.Count = 1 Then
+                                Dim oNEWDocID = oNEW_DOC.Rows(0).Item(0)
+                                ClassLogger.Add($"New DocID is {oNEWDocID}!!", False)
+                                osql = $"EXEC PRPMO_DOC_CHANGE_DOCID {DocID},{oNEWDocID},'{USER_USERNAME}'"
+                                If LogErrorsOnly = False Then ClassLogger.Add(osql, False)
+                                If clsDatabase.Execute_non_Query(osql, False) = False Then
+                                        ClassLogger.Add($"Could not relink the DocID!!", False)
+                                    End If
+                                End If
+                            End If
                     End If
-                End If
+
+                Catch ex As Exception
+                    ClassLogger.Add("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+                    Try
+                        Process.Start(RESULT_DOC_PATH)
+                    Catch ex1 As Exception
+                        ClassLogger.Add("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID, True)
+                    End Try
+
+                End Try
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in File_SYSOPEN:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
@@ -239,14 +278,12 @@ Public Class ClassHelper
     Private Shared Sub FOLDER_OPEN(PATH As Object, DocID As String)
         Try
             If PATH <> Nothing Then
-
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> in FOLDER_OPEN(" & PATH & ")", False)
                 If System.IO.Directory.Exists(PATH) = True Then
                     Process.Start(PATH)
                 Else
                     MsgBox("Folder '" & PATH & "' not existing or accessible!", MsgBoxStyle.Exclamation)
                 End If
-
-
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in FOLDER_OPEN:" & vbNewLine & ex.Message & vbNewLine & PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
diff --git a/app/DD-Record-Organizer/ClassImport_Windream.vb b/app/DD-Record-Organizer/ClassImport_Windream.vb
index 18cf853..aaf46f9 100644
--- a/app/DD-Record-Organizer/ClassImport_Windream.vb
+++ b/app/DD-Record-Organizer/ClassImport_Windream.vb
@@ -143,11 +143,11 @@ Public Class ClassImport_Windream
             If Not IsDBNull(oDYNAMIC_FOLDER) Then
                 If oDYNAMIC_FOLDER <> String.Empty Then
                     If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
-                        If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then
-                            oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
-                        Else
-                            oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER
-                        End If
+                        'If CURRENT_VARIABLE_FOLDER_OVERRIDE = True Then
+                        '    oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
+                        'Else
+                        oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER
+                        'End If
 
                     Else
                         MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
@@ -489,6 +489,7 @@ Public Class ClassImport_Windream
             For Each element As System.Text.RegularExpressions.Match In elemente
                 If LogErrorsOnly = False Then ClassLogger.Add(" >> Elementname in FolderString: '" & element.ToString & "'", False)
                 Dim EL_SUBSTRING = element.Value.Substring(2, 1).ToUpper
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> EL_SUBSTRING is: '" & EL_SUBSTRING & "'", False)
                 Select Case EL_SUBSTRING
                     'Manueller Indexwert
                     Case "A"
@@ -518,6 +519,7 @@ Public Class ClassImport_Windream
                                             If IsDBNull(AUTOindexresult) Then
                                                 ClassLogger.Add(">> unexpected: AUTOindexresult is DBNULL - " & sql_command, False)
                                             Else
+                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> AUTOindexresult is: '" & AUTOindexresult & "'", False)
                                                 FolderConvention = FolderConvention.Replace(element.ToString, AUTOindexresult)
                                             End If
                                         End If
@@ -584,6 +586,7 @@ Public Class ClassImport_Windream
                         Dim split() As String = elmt
                         If split.Length = 2 Then
                             Dim VARTYPE = split(0)
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> VARTYPE is: '" & VARTYPE & "'", False)
                             Select Case VARTYPE
                                 Case "ARDoctype"
                                     FolderConvention = FolderConvention.Replace(element.ToString, CURRENT_DOKARTSTRING)
@@ -687,6 +690,7 @@ Public Class ClassImport_Windream
                         ClassLogger.Add(" -Undefined pattern found in folderconvention" & vbNewLine & "Elementname: " & element.Value.ToUpper)
                         MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
                 End Select
+                If LogErrorsOnly = False Then ClassLogger.Add($" >> FolderConvention so far is: '{FolderConvention}'", False)
             Next
             CURRENT_VARIABLE_FOLDER = FolderConvention
             Return True
diff --git a/app/DD-Record-Organizer/ClassInit.vb b/app/DD-Record-Organizer/ClassInit.vb
index e376ae0..93fc24a 100644
--- a/app/DD-Record-Organizer/ClassInit.vb
+++ b/app/DD-Record-Organizer/ClassInit.vb
@@ -125,6 +125,13 @@ Public Class ClassInit
             sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID")
             CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)
             clsCURRENT.LOG_ERRORS_ONLY = LogErrorsOnly
+
+            sql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE")
+            Dim oDTFF_CHANGE As DataTable = ClassDatabase.Return_Datatable(sql, True)
+            For Each oRow As DataRow In oDTFF_CHANGE.Rows
+                FILE_FORMATS_CHANGE_DURING_EDIT.Add(oRow.Item("FILE_EXT"))
+            Next
+
         Catch ex As Exception
             MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
index 13c7d60..e9e7f00 100644
--- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
@@ -52,6 +52,7 @@
     Public CURRENT_CONSTRUCTOR_DETAIL_ID As Integer
     Public CURRENT_FILEID As Integer
     Public CURRENT_FILENAME As String
+    Public CURRENT_OFFICE_FILE_CHANGED As Boolean = False
     Public CURRENT_NEWFILENAME As String
     Public CURRENT_CONTROL_DOCTYPE_MATCH As String = ""
     Public CURRENT_NOTIFICATION_MSG As String
@@ -79,6 +80,7 @@
     Public JUMP_RECORD_ID As Integer
 
     Public TEMP_FILES As List(Of String) = New List(Of String)
+    Public FILE_FORMATS_CHANGE_DURING_EDIT As List(Of String) = New List(Of String)
 
     Public LICENSE_EXPIRED As Boolean = False
     Public LICENSE_COUNT As Integer = 0
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
index 5acefcd..765dc0c 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
@@ -389,7 +389,8 @@ Partial Class frmConstructor_Main
         '
         'tstxtRenameNode
         '
-        Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.ActiveCaption
+        Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control
+        Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText
         Me.tstxtRenameNode.Name = "tstxtRenameNode"
         resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
         '
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx
index 989f0c3..d95fce8 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@@ -296,7 +296,7 @@
     <value>Knoten umbenennen</value>
   </data>
   <data name="SdsdToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>212, 22</value>
+    <value>216, 26</value>
   </data>
   <data name="SdsdToolStripMenuItem.Text" xml:space="preserve">
     <value>Knotentext:</value>
@@ -305,7 +305,7 @@
     <value>152, 23</value>
   </data>
   <data name="ToolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>209, 6</value>
+    <value>213, 6</value>
   </data>
   <data name="OberhalbToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -316,7 +316,7 @@
 </value>
   </data>
   <data name="OberhalbToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>212, 22</value>
+    <value>216, 26</value>
   </data>
   <data name="OberhalbToolStripMenuItem.Text" xml:space="preserve">
     <value>Auf dieser Ebene</value>
@@ -331,7 +331,7 @@
 </value>
   </data>
   <data name="UnterhalbToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>212, 22</value>
+    <value>216, 26</value>
   </data>
   <data name="UnterhalbToolStripMenuItem.Text" xml:space="preserve">
     <value>Unterhalb</value>
@@ -550,7 +550,7 @@
     <value>0, 27</value>
   </data>
   <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>981, 210</value>
+    <value>988, 210</value>
   </data>
   <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -693,7 +693,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>981, 27</value>
+    <value>988, 27</value>
   </data>
   <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -777,7 +777,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>699, 374</value>
+    <value>699, 381</value>
   </data>
   <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -807,7 +807,7 @@
     <value>0, 26</value>
   </data>
   <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>555, 323</value>
+    <value>562, 330</value>
   </data>
   <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -854,10 +854,10 @@
     <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
   </data>
   <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 349</value>
+    <value>0, 356</value>
   </data>
   <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>555, 25</value>
+    <value>562, 25</value>
   </data>
   <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -884,7 +884,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>555, 26</value>
+    <value>562, 26</value>
   </data>
   <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -905,7 +905,7 @@
     <value>Panel2</value>
   </data>
   <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 378</value>
+    <value>1270, 385</value>
   </data>
   <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1081,7 +1081,7 @@
     <value>1</value>
   </data>
   <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 405</value>
+    <value>1270, 412</value>
   </data>
   <data name="TabDetails.Text" xml:space="preserve">
     <value>Detailansicht</value>
@@ -1099,7 +1099,7 @@
     <value>0</value>
   </data>
   <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1276, 436</value>
+    <value>1276, 443</value>
   </data>
   <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index ad95159..487cde8 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -6814,6 +6814,7 @@ Public Class frmConstructor_Main
             End If
             For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
                 ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"))
+                If CURRENT_OFFICE_FILE_CHANGED = True Then RUN_WDSEARCH_GRID()
             Next
         Else
             If clsWD_GET.WDFile_exists(ClassWindreamDocGrid.SELECTED_DOC_PATH, DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then
diff --git a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx
index b5bb716..d63f742 100644
--- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx
+++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx
@@ -2025,7 +2025,7 @@
     <value>0, 27</value>
   </data>
   <data name="ListBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>305, 225</value>
+    <value>305, 222</value>
   </data>
   <data name="ListBox2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -2213,7 +2213,7 @@
     <value>0, 0</value>
   </data>
   <data name="TBDD_INDEX_AUTOMBindingNavigator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 27</value>
+    <value>1261, 27</value>
   </data>
   <data name="TBDD_INDEX_AUTOMBindingNavigator.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -2234,7 +2234,7 @@
     <value>22</value>
   </data>
   <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 252</value>
+    <value>1261, 249</value>
   </data>
   <data name="XtraTabPage1.Text" xml:space="preserve">
     <value>Automatische Indexe</value>
@@ -2270,7 +2270,7 @@
     <value>0, 27</value>
   </data>
   <data name="ListBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>305, 225</value>
+    <value>305, 222</value>
   </data>
   <data name="ListBox1.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -2458,7 +2458,7 @@
     <value>0, 0</value>
   </data>
   <data name="BindingNavigator2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 27</value>
+    <value>1261, 27</value>
   </data>
   <data name="BindingNavigator2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -2479,7 +2479,7 @@
     <value>1</value>
   </data>
   <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 252</value>
+    <value>1261, 249</value>
   </data>
   <data name="XtraTabPage3.Text" xml:space="preserve">
     <value>Manuelle Indexe</value>
@@ -2817,7 +2817,7 @@
     <value>0, 0</value>
   </data>
   <data name="BindingNavigator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 27</value>
+    <value>1261, 27</value>
   </data>
   <data name="BindingNavigator1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -2838,7 +2838,7 @@
     <value>5</value>
   </data>
   <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 252</value>
+    <value>1261, 249</value>
   </data>
   <data name="XtraTabPage2.Text" xml:space="preserve">
     <value>Zurodnung Dokumentart - Entität</value>
@@ -3273,7 +3273,7 @@
     <value>6</value>
   </data>
   <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1265, 252</value>
+    <value>1261, 249</value>
   </data>
   <data name="XtraTabPage4.Text" xml:space="preserve">
     <value>Variabler Ordnerpfad</value>
diff --git a/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb b/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb
index 100dddd..14065a3 100644
--- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb
+++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.vb
@@ -280,12 +280,12 @@ Public Class frmWM_DoctypeConfig
             Exit Sub
         End Try
         Try
-            Dim sql = String.Format("SELECT [CONTROL_ID] , [CONTROL_COL_NAME]AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] " & _
-                    "WHERE CTRLTYPE_ID in (2,3,4) and FORM_ID = {0} UNION ALL " & _
-                    "SELECT [CONTROL_ID] , [CTRLSCR_CAPTION]  AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] " & _
-                    "WHERE CTRLTYPE_ID = 1 AND [CONTROL_SQLCOMMAND_1] <> '' and FORM_ID = {0} UNION ALL " & _
-                    "SELECT '999', 'Doctype'  AS DISPLAY " & _
-                    "ORDER BY DISPLAY", GUIDTextBox.Text)
+            Dim sql = String.Format("SELECT [CONTROL_ID] , [CONTROL_COL_NAME]AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] " &
+                    "WHERE CTRLTYPE_ID in (2,3,4) and FORM_VIEW_ID = {0} UNION ALL " &
+                    "SELECT [CONTROL_ID] , [CTRLSCR_CAPTION]  AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] " &
+                    "WHERE CTRLTYPE_ID = 1 AND [CONTROL_SQLCOMMAND_1] <> '' and FORM_VIEW_ID = {0} UNION ALL " &
+                    "SELECT '999', 'Doctype'  AS DISPLAY " &
+                    "ORDER BY DISPLAY", cmbFormViewVariablePath.SelectedValue)
             Dim DT1 As DataTable = ClassDatabase.Return_Datatable(sql)
             If DT1.Rows.Count >= 1 Then
                 cmbIndex_Controls.DataSource = DT1