diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
index 5197fdc9..e0eed7f2 100644
--- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
+++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
@@ -376,10 +376,10 @@ Public Class frmAdmin_Globix
                 Case XtraTabPageDynamicFolder.Name
                     cmbAllAttributes.Items.Clear()
                     For Each oRowMan As DataRow In Me.GlobixDataset.TBDD_INDEX_MAN.Rows
-                        cmbAllAttributes.Items.Add(oRowMan.Item("WD_INDEX"))
+                        cmbAllAttributes.Items.Add(oRowMan.Item("WD_INDEX") + " - M")
                     Next
                     For Each oRowMan As DataRow In Me.GlobixDataset.TBDD_INDEX_AUTOM.Rows
-                        cmbAllAttributes.Items.Add(oRowMan.Item("INDEXNAME"))
+                        cmbAllAttributes.Items.Add(oRowMan.Item("INDEXNAME") + " - A")
                     Next
             End Select
             'Else
@@ -512,9 +512,9 @@ Public Class frmAdmin_Globix
         If cmbAllAttributes.SelectedIndex <> -1 Then
 
             Dim oPattern As String
-            If cmbAllAttributes.Text.EndsWith("#M") Then
+            If cmbAllAttributes.Text.EndsWith("M") Then
                 oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_MAN, cmbAllAttributes.Text)
-            Else
+            ElseIf cmbAllAttributes.Text.EndsWith("A") Then
                 oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_AUTO, cmbAllAttributes.Text)
             End If
             Me.FOLDER_FOR_INDEXTextEdit.Text = str & oPattern
diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
index 682bebc4..bc5af4cb 100644
--- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
+++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
@@ -304,11 +304,11 @@ Public Class frmGlobix_Index
     Sub Refresh_Dokart()
         Try
             Dim oDocTypes As New List(Of DocType)
-            Dim oSql = String.Format($"SELECT A.DOCTYPE_ID,DL.Doctype,A.OBJECT_ST_NAME, DL.Doctype_ID as IDBDoctype_ID FROM VWGI_DOCTYPE_USER A INNER JOIN TBDD_DOKUMENTART DT ON A.DOCTYPE_ID = DT.GUID
-INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_ID WHERE A.AKTIV = 1 AND A.USERNAME = '{My.Application.User.UserName}' ORDER BY A.SEQUENCE")
+            Dim oSql = String.Format($"SELECT A.DOCTYPE_ID,A.USERNAME,DL.Doctype,A.OBJECT_ST_NAME, DL.Doctype_ID as IDBDoctype_ID,DL.LANG_CODE,A.SEQUENCE FROM VWGI_DOCTYPE_USER A INNER JOIN TBDD_DOKUMENTART DT ON A.DOCTYPE_ID = DT.GUID
+INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_ID WHERE A.AKTIV = 1 AND A.USERNAME = '{My.Application.User.UserName}' AND DL.LANG_CODE = '{My.Application.User.Language}' ORDER BY A.SEQUENCE")
             Dim oTable = Database.GetDatatable("VWGI_DOCTYPE_USER", oSql, ECM,
                                                pSortByColumn:="SEQUENCE",
-                                               pFilterExpression:=$"AKTIV = 1 AND USERNAME = '{My.Application.User.UserName}'")
+                                               pFilterExpression:=$"AKTIV = 1 AND USERNAME = '{My.Application.User.UserName}' AND LANG_CODE = '{My.Application.User.Language}'")
 
             For Each oRow As DataRow In oTable.Rows
                 Dim oDocType = New DocType With {