diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config
index 35a4608..fb444a5 100644
--- a/app/TaskFlow/App.config
+++ b/app/TaskFlow/App.config
@@ -102,7 +102,8 @@
     </DevExpress.LookAndFeel.Design.AppSettings>
   </applicationSettings>
   <connectionStrings>
-    <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" />
+    <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
@@ -229,7 +230,7 @@
         <value>0, 0</value>
       </setting>
       <setting name="frmValSearchSplitterDistance" serializeAs="String">
-        <value>563</value>
+        <value>385</value>
       </setting>
       <setting name="frmMainWindowState" serializeAs="String">
         <value>Normal</value>
diff --git a/app/TaskFlow/ClassAllgemeineFunktionen.vb b/app/TaskFlow/ClassAllgemeineFunktionen.vb
index 68b6cba..e9d3978 100644
--- a/app/TaskFlow/ClassAllgemeineFunktionen.vb
+++ b/app/TaskFlow/ClassAllgemeineFunktionen.vb
@@ -366,4 +366,55 @@ Public Class ClassAllgemeineFunktionen
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error saving log file")
         End Try
     End Sub
+    Public Shared Function NotNull(Of T)(value As Object, defaultValue As T) As T
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then
+            Return defaultValue
+        End If
+
+        ' Versuche den Wert in den gewünschten Typ zu konvertieren
+        Try
+            Return CType(value, T)
+        Catch ex As InvalidCastException
+            ' Falls die Konvertierung fehlschlägt, gib den Default zurück
+            Return defaultValue
+        End Try
+    End Function
+    Public Shared Function NotNullNullable(Of T As Structure)(value As Object, defaultValue As Nullable(Of T)) As Nullable(Of T)
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then
+            Return defaultValue
+        End If
+        Try
+            ' Direkte Casts sind robust, wandeln aber DBNull nicht – das ist bereits oben abgefangen.
+            Return DirectCast(value, Nullable(Of T))
+        Catch
+            Try
+                ' Fallback: in T casten und zu Nullable machen
+                Return New Nullable(Of T)(DirectCast(value, T))
+            Catch
+                Return defaultValue
+            End Try
+        End Try
+    End Function
+    Public Shared Function NotNullString(value As Object, defaultValue As Object) As String
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
+        Return CStr(value)
+    End Function
+
+    Public Shared Function NotNullDate(value As Object, defaultValue As DateTime) As DateTime?
+        If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
+        Return DirectCast(value, DateTime)
+    End Function
+    Public Shared Function NewShortGuid() As String
+        ' Neue GUID erzeugen
+        Dim g As Guid = Guid.NewGuid()
+
+        ' In Base64 umwandeln
+        Dim b64 As String = Convert.ToBase64String(g.ToByteArray())
+
+        ' Unerwünschte Zeichen ersetzen/entfernen
+        b64 = b64.Replace("=", "").Replace("+", "-").Replace("/", "_")
+
+        ' Ergebnis zurückgeben
+        Return b64
+    End Function
 End Class
diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb
index 95e2e06..bc7df42 100644
--- a/app/TaskFlow/ClassControlCreator.vb
+++ b/app/TaskFlow/ClassControlCreator.vb
@@ -104,17 +104,17 @@ Public Class ClassControlCreator
     Private Function TransformDataRow(row As DataRow) As ControlDBProps
         Dim x As Integer = row.Item("X_LOC")
         Dim y As Integer = row.Item("Y_LOC")
-        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
-        Dim size As Single = NotNull(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
-        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
+        Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
+        Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
+        Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
         Dim family As FontFamily = New FontFamily(familyString)
 
         Dim oGuid As Integer = row.Item("GUID")
-        Dim oControlName As String = NotNull(row.Item("NAME"), "")
-        Dim oAttribute As String = NotNull(row.Item("INDEX_NAME"), "")
+        Dim oControlName As String = ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), "")
+        Dim oAttribute As String = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
         Dim oLocation As New Point(x, y)
         Dim oFont As New Font(family, size, style, GraphicsUnit.Point)
-        Dim oColor As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        Dim oColor As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
         Dim oReadOnly As Boolean = row.Item("READ_ONLY")
         Dim oAddNewItems As Boolean = row.Item("VKT_ADD_ITEM")
         If oAttribute = "@@DISPLAY_ONLY" And oReadOnly = False Then
@@ -171,7 +171,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewTextBox(location As Point) As TextEdit
         Dim control As New TextEdit With {
-            .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGuid()}",
+            .Name = $"{PREFIX_TEXTBOX}_{ClassAllgemeineFunktionen.NewShortGuid()}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Location = location,
             .ReadOnly = True,
@@ -184,7 +184,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewLabel(location As Point) As Label
         Dim control As New Label With {
-            .Name = $"{PREFIX_LABEL}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LABEL}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Text = DEFAULT_TEXT,
             .AutoSize = True,
             .Location = location,
@@ -196,7 +196,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewCheckbox(location As Point) As CheckBox
         Dim control As New CheckBox With {
-            .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_CHECKBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .AutoSize = True,
             .Text = DEFAULT_TEXT,
             .Cursor = Cursors.Hand,
@@ -209,7 +209,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewCombobox(location As Point) As Windows.Forms.ComboBox
         Dim control As New Windows.Forms.ComboBox With {
-            .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_COMBOBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Cursor = Cursors.Hand,
             .Location = location
@@ -220,7 +220,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewDatetimepicker(location As Point) As DateTimePicker
         Dim control As New DateTimePicker With {
-            .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_DATETIMEPICKER}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Cursor = Cursors.Hand,
             .Location = location,
@@ -232,7 +232,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewDatagridview(location As Point) As DataGridView
         Dim control As New DataGridView With {
-            .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_DATAGRIDVIEW}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
             .Cursor = Cursors.Hand,
             .Location = location,
@@ -252,7 +252,7 @@ Public Class ClassControlCreator
 
     Friend Function CreateNewLookupControl(location As Point) As LookupControl3
         Dim control As New LookupControl3 With {
-            .Name = $"{PREFIX_LOOKUP}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LOOKUP}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
             .Cursor = Cursors.Hand,
             .Location = location
@@ -262,7 +262,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewTable(location As Point) As GridControl
         Dim oControl As New GridControl With {
-            .Name = $"{PREFIX_TABLE}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_TABLE}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
             .Cursor = Cursors.Hand,
             .Location = location,
@@ -282,7 +282,7 @@ Public Class ClassControlCreator
 
     Public Function CreateNewLine(location As Point) As LineLabel
         Dim control As New LineLabel With {
-            .Name = $"{PREFIX_LINE}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_LINE}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Text = "---------------------------------",
             .Size = New Size(100, 5),
             .Location = location
@@ -292,7 +292,7 @@ Public Class ClassControlCreator
     End Function
     Public Function CreateNewButton(location As Point) As Button
         Dim control As New Button With {
-            .Name = $"{PREFIX_BUTTON}_{clsTools.ShortGuid}",
+            .Name = $"{PREFIX_BUTTON}_{ClassAllgemeineFunktionen.NewShortGuid}",
             .Size = New Size(108, 28),
             .Cursor = Cursors.Hand,
             .Location = location
@@ -605,7 +605,7 @@ Public Class ClassControlCreator
         control.Text = "------------------------------"
         control.BorderStyle = BorderStyle.None
         control.AutoSize = False
-        control.BackColor = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        control.BackColor = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
 
         Return control
diff --git a/app/TaskFlow/ClassFinalIndex.vb b/app/TaskFlow/ClassFinalIndex.vb
index 19ec4bb..96b6718 100644
--- a/app/TaskFlow/ClassFinalIndex.vb
+++ b/app/TaskFlow/ClassFinalIndex.vb
@@ -114,12 +114,12 @@ Public Class ClassFinalIndex
             props.VectorIndex = isVector
 
             If type = INDEX_TYPE_STRING Or type = INDEX_TYPE_VECTOR_STRING Then
-                value = NotNull(value, "")
+                value = ClassAllgemeineFunktionen.NotNullString(value, "")
 
                 props.StringValue = value
             ElseIf type = INDEX_TYPE_INTEGER Or type = INDEX_TYPE_INTEGER64 Or type = INDEX_TYPE_VECTOR_INTEGER_64 Then
                 Try
-                    value = NotNull(Of Integer)(value, 0)
+                    value = ClassAllgemeineFunktionen.NotNullString(value, 0)
                     If value = String.Empty Then
                         props.IntegerValue = 0
                     Else
@@ -138,7 +138,7 @@ Public Class ClassFinalIndex
                 If value = "SQL-Command" Then
                     props.FloatValue = 0
                 Else
-                    value = NotNull(Of Double)(value, 0)
+                    value = ClassAllgemeineFunktionen.NotNullString(value, 0)
 
                     If value = String.Empty Then
                         props.FloatValue = 0
@@ -148,7 +148,7 @@ Public Class ClassFinalIndex
                 End If
 
             ElseIf type = INDEX_TYPE_BOOLEAN Or type = INDEX_TYPE_VECTOR_BOOLEAN Then
-                value = NotNull(value, "False")
+                value = ClassAllgemeineFunktionen.NotNullString(value, "False")
 
                 If value = "1" Or value.ToLower = "true" Then
                     props.BoolValue = True
diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb
index d4a375f..684b613 100644
--- a/app/TaskFlow/ClassInit.vb
+++ b/app/TaskFlow/ClassInit.vb
@@ -521,6 +521,10 @@ Public Class ClassInit
             oSql = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
 
             BASEDATA_DT_LANGUAGE = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
+            oSql = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
+            BASEDATA_TBDD_COLUMNS_FORMAT = DatabaseFallback.GetDatatable("TBDD_COLUMNS_FORMAT", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
             oStopWatch.Done()
         Catch ex As Exception
             LOGGER.Error(ex)
diff --git a/app/TaskFlow/ClassRegexEditor.vb b/app/TaskFlow/ClassRegexEditor.vb
index 8900218..31647d7 100644
--- a/app/TaskFlow/ClassRegexEditor.vb
+++ b/app/TaskFlow/ClassRegexEditor.vb
@@ -12,7 +12,7 @@ Public Class ClassRegexEditor
 
     Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
         Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim oRegexString As String = NotNull(value, String.Empty)
+        Dim oRegexString As String = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)
 
         If oService IsNot Nothing Then
             Using oform As New frmRegexEditor()
diff --git a/app/TaskFlow/ModuleControlProperties.vb b/app/TaskFlow/ModuleControlProperties.vb
index eab8a9c..2e2850e 100644
--- a/app/TaskFlow/ModuleControlProperties.vb
+++ b/app/TaskFlow/ModuleControlProperties.vb
@@ -124,7 +124,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_DATA)>
         Public Property SQLCommand() As SQLValue
             Get
-                Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_sql_command, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _sql_command = value.Value
@@ -150,7 +150,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Enable_SQL() As SQLValue
             Get
-                Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _Enable_SQL = value.Value
@@ -163,7 +163,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Enable_SQL_OnLoad() As SQLValue
             Get
-                Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL_ONLOAD, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _Enable_SQL_ONLOAD = value.Value
@@ -335,7 +335,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_DISPLAY)>
         Public Property CtrlImage() As ImageValue
             Get
-                Return New ImageValue(NotNull(_image_Value, ""))
+                Return New ImageValue(ClassAllgemeineFunktionen.NotNullString(_image_Value, ""))
             End Get
             Set(ByVal value As ImageValue)
                 _image_Value = value.Value
@@ -346,7 +346,7 @@ Public Module ModuleControlProperties
         <Category(ClassConstants.CAT_VALIDATION)>
         Public Property Override_SQL() As SQLValue
             Get
-                Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection
+                Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Override_SQL, "")) ', _sql_connection
             End Get
             Set(ByVal value As SQLValue)
                 _Override_SQL = value.Value
diff --git a/app/TaskFlow/ModuleRuntimeVariables.vb b/app/TaskFlow/ModuleRuntimeVariables.vb
index ff51a68..e7b749a 100644
--- a/app/TaskFlow/ModuleRuntimeVariables.vb
+++ b/app/TaskFlow/ModuleRuntimeVariables.vb
@@ -32,6 +32,10 @@ Module ModuleRuntimeVariables
     Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable
     Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable
 
+    Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
+
+
+
     Public Property CURRENT_ProfilGUID As Integer
     Public Property CURRENT_ProfilName As String
     Public Property CURRENT_PROFILE_LOG_INDEX As String
diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb
index 13f822d..104f5f0 100644
--- a/app/TaskFlow/My Project/AssemblyInfo.vb	
+++ b/app/TaskFlow/My Project/AssemblyInfo.vb	
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.1.0")>
+<Assembly: AssemblyVersion("2.7.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 <Assembly: NeutralResourcesLanguage("")>
diff --git a/app/TaskFlow/My Project/Settings.Designer.vb b/app/TaskFlow/My Project/Settings.Designer.vb
index 7dff18f..81bf1b5 100644
--- a/app/TaskFlow/My Project/Settings.Designer.vb	
+++ b/app/TaskFlow/My Project/Settings.Designer.vb	
@@ -156,7 +156,7 @@ Namespace My
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("563")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("385")>  _
         Public Property frmValSearchSplitterDistance() As Integer
             Get
                 Return CType(Me("frmValSearchSplitterDistance"),Integer)
diff --git a/app/TaskFlow/My Project/Settings.settings b/app/TaskFlow/My Project/Settings.settings
index 5b14335..5ebe76d 100644
--- a/app/TaskFlow/My Project/Settings.settings	
+++ b/app/TaskFlow/My Project/Settings.settings	
@@ -27,7 +27,7 @@
       <Value Profile="(Default)">0, 0</Value>
     </Setting>
     <Setting Name="frmValSearchSplitterDistance" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">563</Value>
+      <Value Profile="(Default)">385</Value>
     </Setting>
     <Setting Name="frmMainWindowState" Type="System.String" Scope="User">
       <Value Profile="(Default)">Normal</Value>
diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj
index 0cdaed4..f976d89 100644
--- a/app/TaskFlow/TaskFlow.vbproj
+++ b/app/TaskFlow/TaskFlow.vbproj
@@ -184,9 +184,6 @@
     <Reference Include="DigitalData.Modules.Interfaces">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.Modules.License">
       <HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
     </Reference>
@@ -456,9 +453,7 @@
     <Compile Include="ClassAnnotation.vb" />
     <Compile Include="ClassConfig.vb" />
     <Compile Include="ClassConstants.vb" />
-    <Compile Include="\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\SchreiberM\Downloads\taskFlow\ClassControlCreator.vb">
-      <Link>ClassControlCreator.vb</Link>
-    </Compile>
+    <Compile Include="ClassControlCreator.vb" />
     <Compile Include="ClassDragDrop.vb" />
     <Compile Include="ClassFinalIndex.vb" />
     <Compile Include="ClassFinalizeDoc.vb" />
diff --git a/app/TaskFlow/clsPatterns.vb b/app/TaskFlow/clsPatterns.vb
index b0f89d6..e780ad7 100644
--- a/app/TaskFlow/clsPatterns.vb
+++ b/app/TaskFlow/clsPatterns.vb
@@ -225,14 +225,14 @@ Public Class clsPatterns
 
                         Case GetType(TextEdit)
                             Try
-                                oReplaceValue = Utils.NotNull(DirectCast(oControl, TextEdit).EditValue, String.Empty)
+                                oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, TextEdit).EditValue, String.Empty)
                             Catch ex As Exception
                                 LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
                                 oReplaceValue = ""
                             End Try
                         Case GetType(MemoEdit)
                             Try
-                                oReplaceValue = Utils.NotNull(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
+                                oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
                             Catch ex As Exception
                                 LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
                                 oReplaceValue = ""
diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb
index e42c9cb..7dcc895 100644
--- a/app/TaskFlow/frmAdministration.vb
+++ b/app/TaskFlow/frmAdministration.vb
@@ -674,17 +674,17 @@ Public Class frmAdministration
             pgFinalIndexes.SelectedObject = Nothing
 
             Dim guid As Integer = focusedRow.Item("GUID")
-            Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing)
-            Dim sqlCommand As String = NotNull(focusedRow.Item("SQL_COMMAND"), "")
-            ' Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
-            Dim value As String = NotNull(focusedRow.Item("VALUE"), "")
-            Dim active As Boolean = NotNull(focusedRow.Item("ACTIVE"), True)
-            Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "")
-            Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False)
-            Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False)
-            Dim VectorBehaviour As String = NotNull(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
-            Dim oSequence As Int16 = NotNull(focusedRow.Item("SEQUENCE"), 0)
-            Dim oIndetermined As Boolean = NotNull(focusedRow.Item("CONTINUE_INDETERMINED"), False)
+            Dim index As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("INDEXNAME"), Nothing)
+            Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SQL_COMMAND"), "")
+            ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONNECTION_ID"), 0)
+            Dim value As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("VALUE"), "")
+            Dim active As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ACTIVE"), True)
+            Dim description As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("DESCRIPTION"), "")
+            Dim preventDuplicates As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("PREVENT_DUPLICATES"), False)
+            Dim allowNewValues As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ALLOW_NEW_VALUES"), False)
+            Dim VectorBehaviour As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
+            Dim oSequence As Int16 = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SEQUENCE"), 0)
+            Dim oIndetermined As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONTINUE_INDETERMINED"), False)
             CURRENT_INDEX_ID = guid
 
             Dim obj As New FinalIndexProperties With {
@@ -1074,25 +1074,25 @@ Public Class frmAdministration
                 Else
                     value = FINALINDICES.GetValue(obj, obj.IndexName, MyIndicies, MyIndicies_Types, obj.VectorIndex)
                 End If
-                value = NotNull(value, String.Empty)
+                value = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)
 
                 Dim guid = obj.GUID
                 Dim oProfileId As Integer = PROFILGUIDTextBox.Text
                 focusedRowHandle = 199
                 focusedRowHandle = viewFinalIndex.FocusedRowHandle
                 'Dim connectionId As Integer = obj.ConnectionId
-                ' Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
-                Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
+                ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.ConnectionId, 1)
+                Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
 
-                Dim indexName As String = NotNull(obj.IndexName, String.Empty)
+                Dim indexName As String = ClassAllgemeineFunktionen.NotNullString(obj.IndexName, String.Empty)
                 Dim isVectorIndex As Boolean = obj.VectorIndex
                 Dim addedWho As String = USER_USERNAME
                 Dim description As String = obj.Description
                 Dim active As Integer = IIf(obj.Active, 1, 0)
                 Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0)
                 Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0)
-                Dim IF_VEKTOR_BEHAVIOUR As String = NotNull(obj.VectorBehaviour, String.Empty)
-                Dim oDescription As String = NotNull(obj.Description, String.Empty)
+                Dim IF_VEKTOR_BEHAVIOUR As String = ClassAllgemeineFunktionen.NotNullString(obj.VectorBehaviour, String.Empty)
+                Dim oDescription As String = ClassAllgemeineFunktionen.NotNullString(obj.Description, String.Empty)
                 Dim oSequence As Integer = obj.Sequence
                 Dim oContinueOIdS As Integer = obj.ContinueOnIndifferentState
                 If indexName = String.Empty Then
diff --git a/app/TaskFlow/frmConnection.vb b/app/TaskFlow/frmConnection.vb
index adafb7e..85ace1e 100644
--- a/app/TaskFlow/frmConnection.vb
+++ b/app/TaskFlow/frmConnection.vb
@@ -330,7 +330,6 @@ Public Class frmConnection
         Catch ex As Exception
             LOGGER.Error(ex)
             MsgBox("Error while loading Databases. Default Database will be set!" & vbCrLf & ex.Message, MsgBoxStyle.Critical)
-            DD_LIB_Standards.clsLogger.Add("Error while loading Databases:" & ex.Message)
         Finally
             Me.Cursor = Cursors.Default
         End Try
diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb
index 64bfca6..77e743e 100644
--- a/app/TaskFlow/frmFormDesigner.vb
+++ b/app/TaskFlow/frmFormDesigner.vb
@@ -1,12 +1,10 @@
 Imports System.ComponentModel
-Imports DD_LIB_Standards
+
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 Imports DigitalData.Controls.LookupGrid
-Imports DigitalData.Modules.Language.Utils
-Imports DigitalData.Modules.Language
 Imports System.Drawing
 Imports DigitalData.GUIs.Common
 Imports DevExpress.Utils.Filtering.Internal
@@ -52,7 +50,7 @@ Public Class frmFormDesigner
             ORDER BY NAME"
         )
         CURRENT_CONTROL_NAME_LIST = oControlNameList.AsEnumerable().
-            Select(Function(row) row.ItemEx("NAME", String.Empty)).
+            Select(Function(row) ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), String.Empty)).
             ToList()
         _Logger.debug("Reloading control name list done!")
     End Sub
@@ -79,7 +77,7 @@ Public Class frmFormDesigner
             '  Try
             ' Windream initialisieren
             If IDB_ACTIVE = False Then
-                clsWindream.Create_Session()
+                'clsWindream.Create_Session()
                 bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             Else
                 bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
@@ -90,7 +88,7 @@ Public Class frmFormDesigner
             Dim unsortedIndicies
             Dim sortedIndicies As List(Of String)
             If IDB_ACTIVE = False Then
-                unsortedIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+                unsortedIndicies = WINDREAM_MOD.GetIndiciesByObjecttype(CURRENT_OBJECTTYPE).ToList()
                 sortedIndicies = unsortedIndicies '.OrderBy(Function(index As String) index).ToList()
                 sortedIndicies = sortedIndicies.OrderBy(Function(index As String) index).ToList
             Else
@@ -112,7 +110,7 @@ Public Class frmFormDesigner
             If IDB_ACTIVE = False Then
                 Windream_ChoiceLists = New List(Of String)
                 Windream_ChoiceLists.Add(String.Empty)
-                Windream_ChoiceLists.AddRange(clsWD_GET.GetChoiceLists())
+                Windream_ChoiceLists.AddRange(WINDREAM_MOD.GetChoiceLists())
             End If
 
             'Catch ex As Exception
@@ -146,7 +144,7 @@ Public Class frmFormDesigner
             Dim missingIndexControls As New List(Of String)
 
             For Each row As DataRow In dt.Rows
-                If NotNull(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
+                If ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
                     missingIndexControls.Add(row.Item("NAME"))
                 End If
             Next
@@ -176,7 +174,7 @@ Public Class frmFormDesigner
     Private Function IsVectorIndex(IndexName As String) As Boolean
         Dim oType As Integer
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -185,9 +183,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotBooleanIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -195,9 +193,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotDateIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -205,9 +203,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -215,9 +213,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotVectorDateIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -225,9 +223,9 @@ Public Class frmFormDesigner
     End Function
 
     Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean
-        Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+        Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
         If IDB_ACTIVE = False Then
-            oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName)
+            oType = WINDREAM_MOD.GetIndexType(IndexName)
         Else
             oType = IDBData.GetTypeOfIndex(IndexName)
         End If
@@ -248,12 +246,12 @@ Public Class frmFormDesigner
                 Dim name As String = row.Item("NAME")
                 Dim x As Integer = row.Item("X_LOC")
                 Dim y As Integer = row.Item("Y_LOC")
-                Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
-                Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
-                Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial")
+                Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
+                Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
+                Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
                 Dim family As FontFamily = New FontFamily(familyString)
                 Dim font As New Font(family, size, style, GraphicsUnit.Point)
-                Dim color As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), 0))
+                Dim color As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0))
 
 
                 ' Jetzt die Control spezifischen Eigenschaften zuweisen
@@ -581,17 +579,17 @@ Public Class frmFormDesigner
         obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC"))
         obj.Name = row.Item("NAME")
         obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
-        obj.ChangedAt = NotNull(row.Item("CHANGED_WHEN"), Nothing)
-        obj.ChangedWho = NotNull(row.Item("CHANGED_WHO"), "")
+        obj.ChangedAt = ClassAllgemeineFunktionen.NotNullDate(row.Item("CHANGED_WHEN"), Nothing)
+        obj.ChangedWho = ClassAllgemeineFunktionen.NotNullString(row.Item("CHANGED_WHO"), "")
 
-        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
-        Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
-        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial")
+        Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
+        Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
+        Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
         Dim family As FontFamily = New FontFamily(familyString)
 
         obj.Font = New Font(family, size, style)
 
-        Dim color As Integer = NotNull(row.Item("FONT_COLOR"), 0)
+        Dim color As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0)
 
         obj.TextColor = IntToColor(color)
 
@@ -614,11 +612,11 @@ Public Class frmFormDesigner
         obj.SaveChangeOnReadOnly = StrToBool(row.Item("SAVE_CHANGE_ON_ENABLED"))
         obj.Required = StrToBool(row.Item("VALIDATION"))
         obj.Active = StrToBool(row.Item("CONTROL_ACTIVE"))
-        obj.Index = NotNull(row.Item("INDEX_NAME"), "")
-        obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing)
+        obj.Index = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
+        obj.DefaultValue = ClassAllgemeineFunktionen.NotNullString(row.Item("DEFAULT_VALUE"), Nothing)
 
         ' Default value for ConnectionID
-        Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
+        Dim oConnectionId = ClassAllgemeineFunktionen.NotNullString(row.Item("CONNECTION_ID"), 0)
         obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"))
         Return obj
     End Function
@@ -679,9 +677,9 @@ Public Class frmFormDesigner
                 Dim check As CheckBox = sender
                 Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, oRow, Source_AllIndicies)
                 checkProps.Text = check.Text
-                checkProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                checkProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                checkProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                checkProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                checkProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                checkProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
                 props = checkProps
             ElseIf TypeOf sender Is LookupControl3 Then
                 Dim oLookup As LookupControl3 = sender
@@ -690,20 +688,20 @@ Public Class frmFormDesigner
                 lookupProps.PreventDuplicates = StrToBool(oRow.Item("VKT_PREVENT_MULTIPLE_VALUES"))
                 lookupProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
                 lookupProps.DisplayAsComboBox = False
-                lookupProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                lookupProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                lookupProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                lookupProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                lookupProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                lookupProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
 
                 props = lookupProps
             ElseIf TypeOf sender Is TextEdit Then
                 'Dim txt As TextEdit = sender
                 Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, oRow, Source_AllIndicies)
-                txtProps.Regex = NotNull(oRow.Item("REGEX_MATCH"), String.Empty)
-                txtProps.RegexMessage = NotNull(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
-                txtProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                txtProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                txtProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
-                txtProps.DisplayFormat = oRow.ItemEx("FORMAT_STRING", ClassControlCreator.CONTROL_TYPE_TEXT)
+                txtProps.Regex = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MATCH"), String.Empty)
+                txtProps.RegexMessage = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
+                txtProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                txtProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                txtProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
+                txtProps.DisplayFormat = ClassAllgemeineFunktionen.NotNullString(oRow.Item("FORMAT_STRING"), ClassControlCreator.CONTROL_TYPE_TEXT)
 
                 props = txtProps
 
@@ -711,18 +709,18 @@ Public Class frmFormDesigner
                 Dim cmb As Windows.Forms.ComboBox = sender
                 Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, oRow, Source_AllIndicies)
                 cmbProps.ChoiceLists = Windream_ChoiceLists
-                cmbProps.ChoiceList = NotNull(oRow.Item("CHOICE_LIST"), String.Empty)
-                cmbProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                cmbProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
-                cmbProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), ""))
+                cmbProps.ChoiceList = ClassAllgemeineFunktionen.NotNullString(oRow.Item("CHOICE_LIST"), String.Empty)
+                cmbProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                cmbProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                cmbProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
                 props = cmbProps
                 cmbProps.DisplayAsLookUpControl = False
 
             ElseIf TypeOf sender Is DateTimePicker Then
                 Dim dtp As DateTimePicker = sender
                 Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, oRow, Source_AllIndicies)
-                dtpProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                dtpProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                dtpProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                dtpProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                 props = dtpProps
 
             ElseIf TypeOf sender Is DataGridView Then
@@ -737,17 +735,17 @@ Public Class frmFormDesigner
                 Dim oGridControl As GridControl = sender
                 Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, oRow, Source_VectorIndicies)
                 oGridProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
-                oGridProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                oGridProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                oGridProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                oGridProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                 props = oGridProps
             ElseIf TypeOf sender Is Button Then
                 Dim oButton As Button = sender
                 Dim oButtonProps As ButtonProperties = CreatePropsObject(New ButtonProperties, oRow, Source_VectorIndicies)
                 oButtonProps.Text = oButton.Text
                 oButtonProps.SQLCommand = New SQLValue(oRow.Item("SQL_UEBERPRUEFUNG"))
-                oButtonProps.Override_SQL = New SQLValue(NotNull(oRow.Item("SQL2"), ""))
-                oButtonProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), ""))
-                oButtonProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
+                oButtonProps.Override_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL2"), ""))
+                oButtonProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
+                oButtonProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
                 If Not IsDBNull(oRow.Item("IMAGE_CONTROL")) Then
                     Dim obimg() As Byte = oRow.Item("IMAGE_CONTROL")
                     Dim oBitmap As Bitmap = ByteArrayToBitmap(obimg)
@@ -980,7 +978,7 @@ Public Class frmFormDesigner
 
     Private Sub MenuItemAddColumn_Click(sender As Object, e As EventArgs) Handles MenuItemAddColumn.Click
         Try
-            Dim oGuid = clsTools.ShortGuid()
+            Dim oGuid = ClassAllgemeineFunktionen.NewShortGuid()
             Dim oColumnName As String = "colNew" & oGuid
             Dim oColumnCaption As String = "New Column " & oGuid
             If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then
diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb
index 3f12933..b1f9bf2 100644
--- a/app/TaskFlow/frmMain.Designer.vb
+++ b/app/TaskFlow/frmMain.Designer.vb
@@ -193,9 +193,7 @@ Partial Class frmMain
         Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
         Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
-        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
-        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
+        Me.bsitmCount = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.GridControlWorkflows, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -214,8 +212,6 @@ Partial Class frmMain
         CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.XtraTabControl1.SuspendLayout()
         Me.SuspendLayout()
         '
         'ImageListProfile
@@ -294,9 +290,9 @@ Partial Class frmMain
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles, Me.bsitmCount})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 56
+        Me.RibbonControl1.MaxItemId = 57
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen})
         Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize})
@@ -852,6 +848,7 @@ Partial Class frmMain
         Me.RibbonStatusBar1.ItemLinks.Add(Me.BSIVERSION1)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDebug)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmCount)
         resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -1594,29 +1591,18 @@ Partial Class frmMain
         Me.BarButtonItem9.Name = "BarButtonItem9"
         Me.BarButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
-        'XtraTabControl1
+        'bsitmCount
         '
-        resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1")
-        Me.XtraTabControl1.Name = "XtraTabControl1"
-        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
-        '
-        'XtraTabPage1
-        '
-        Me.XtraTabPage1.Name = "XtraTabPage1"
-        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
-        '
-        'XtraTabPage2
-        '
-        Me.XtraTabPage2.Name = "XtraTabPage2"
-        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
+        resources.ApplyResources(Me.bsitmCount, "bsitmCount")
+        Me.bsitmCount.Id = 56
+        Me.bsitmCount.Name = "bsitmCount"
+        Me.bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
         '
         'frmMain
         '
         Me.Appearance.Options.UseFont = True
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.XtraTabControl1)
         Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
@@ -1649,8 +1635,6 @@ Partial Class frmMain
         CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.XtraTabControl1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -1824,7 +1808,5 @@ Partial Class frmMain
     Friend WithEvents GridViewWorkflows As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents BSIVERSION1 As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents barbtnitmsaveLogfiles As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
-    Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents bsitmCount As DevExpress.XtraBars.BarStaticItem
 End Class
diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx
index ff95cf4..3cf7495 100644
--- a/app/TaskFlow/frmMain.resx
+++ b/app/TaskFlow/frmMain.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAVABCwFQAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAWABCwFgAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1487,6 +1487,9 @@
         OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
+  <data name="bsitmCount.Caption" xml:space="preserve">
+    <value>0 Filtered Rows</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -1518,7 +1521,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>3</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
     <value>RibbonControl1</value>
@@ -1530,10 +1533,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="GridControlWorkflows.Size" type="System.Drawing.Size, System.Drawing">
-    <value>715, 354</value>
+    <value>945, 484</value>
   </data>
   <data name="GridControlWorkflows.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -1569,7 +1572,7 @@
     <value>233, 0</value>
   </data>
   <data name="Panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>715, 24</value>
+    <value>945, 24</value>
   </data>
   <data name="Panel2.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -1776,7 +1779,7 @@
     <value>233</value>
   </data>
   <data name="NavBarControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 378</value>
+    <value>233, 508</value>
   </data>
   <data name="NavBarControl1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -1796,14 +1799,17 @@
   <data name="&gt;&gt;NavBarControl1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
   <data name="Panel1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 9pt</value>
   </data>
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>230, 288</value>
+    <value>0, 158</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>948, 378</value>
+    <value>1178, 508</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -1818,7 +1824,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>2</value>
   </data>
   <data name="RibbonPageGroup1.Text" xml:space="preserve">
     <value>Allgemein</value>
@@ -2048,7 +2054,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlBottom.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>7</value>
   </data>
   <data name="barDockControlLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Left</value>
@@ -2069,7 +2075,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlLeft.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="barDockControlRight.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -2090,7 +2096,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlRight.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>6</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -2104,63 +2110,6 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>1178, 688</value>
   </data>
-  <data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>31, 181</value>
-  </data>
-  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 207</value>
-  </data>
-  <data name="XtraTabPage1.Text" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.Name" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>181, 230</value>
-  </data>
-  <data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 207</value>
-  </data>
-  <data name="XtraTabPage2.Text" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.Name" xml:space="preserve">
-    <value>XtraTabPage2</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.Name" xml:space="preserve">
-    <value>XtraTabControl1</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 12pt</value>
   </data>
@@ -2675,6 +2624,12 @@
   <data name="&gt;&gt;barbtnitmsaveLogfiles.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bsitmCount.Name" xml:space="preserve">
+    <value>bsitmCount</value>
+  </data>
+  <data name="&gt;&gt;bsitmCount.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -3628,7 +3583,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;barDockControlTop.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>8</value>
   </data>
   <data name="RibbonPage2.Text" xml:space="preserve">
     <value>RibbonPage2</value>
diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb
index 86ee0ab..c37e6ad 100644
--- a/app/TaskFlow/frmMain.vb
+++ b/app/TaskFlow/frmMain.vb
@@ -1,24 +1,25 @@
-Imports System.Globalization
-Imports DevExpress.Utils
-Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
-Imports DevExpress.XtraGrid.Views.Grid
-Imports DevExpress.XtraGrid
-Imports DevExpress.XtraNavBar
-Imports DevExpress.XtraGrid.Columns
-Imports System.Threading
-Imports System.ComponentModel
+Imports System.ComponentModel
+Imports System.Globalization
 Imports System.IO
-Imports DevExpress.XtraPrinting
-Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
-Imports DigitalData.Modules.EDMI.API.Constants
-Imports DigitalData.Modules.Windream
-Imports DigitalData.GUIs.Common
-Imports DevExpress.XtraGrid.Views.BandedGrid
-Imports DevExpress.XtraBars.Ribbon
-Imports DigitalData.Modules.ZooFlow
+Imports System.Threading
 Imports DevExpress.LookAndFeel
-Imports DigitalData.Modules.Base
+Imports DevExpress.Utils
+Imports DevExpress.XtraBars.Ribbon
+Imports DevExpress.XtraExport.Helpers
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.XtraGrid.Views.BandedGrid
 Imports DevExpress.XtraGrid.Views.Base
+Imports DevExpress.XtraGrid.Views.Grid
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+Imports DevExpress.XtraNavBar
+Imports DevExpress.XtraPrinting
+Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.EDMI.API.Constants
+Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
+Imports DigitalData.Modules.Windream
+Imports DigitalData.Modules.ZooFlow
 
 Public Class frmMain
     Private Property FormHelper As FormHelper
@@ -1404,8 +1405,8 @@ Public Class frmMain
                 cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
                 Thread.CurrentThread.CurrentCulture = cultureInfo
                 Thread.CurrentThread.CurrentUICulture = cultureInfo
-                cultureInfo.DefaultThreadCurrentCulture = cultureInfo
-                cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
+                CultureInfo.DefaultThreadCurrentCulture = cultureInfo
+                CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -2159,12 +2160,10 @@ Public Class frmMain
             RestoreLayout()
 
             Try
-                Dim oSQLFormat = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
-                Dim dtColFormat As DataTable = Await DatabaseFallback.GetDatatableECMAsync(oSQLFormat)
 
                 For Each oColumn As DevExpress.XtraGrid.Columns.GridColumn In GridViewWorkflows.Columns
 
-                    For Each oRow As DataRow In dtColFormat.Rows
+                    For Each oRow As DataRow In BASEDATA_TBDD_COLUMNS_FORMAT.Rows
                         Dim colName = oRow("COLUMN_TITLE").ToString()
 
                         If oColumn.FieldName = colName Then
@@ -2179,7 +2178,10 @@ Public Class frmMain
                                 If oColumn.ColumnType = GetType(DateTime) And oColumn.DisplayFormat.FormatString <> "dd.MM.yyyy HH:mm:ss" Then
                                     oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:mm:ss"
                                 End If
-
+                            ElseIf oSollFormatType = "Numeric" Then
+                                If oColumn.ColumnType <> GetType(Int32) Then
+                                    oColumn.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric
+                                End If
                             End If
                         End If
                     Next
@@ -2888,13 +2890,17 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
             End If
             If Ev_Filter_Panel_Closed = False Then
-                Dim oTermFilterActive As String = S.Filter_aktiv
+                Dim oTermFilterActive As String = String.Format("{0} ({1})", S.Filter_aktiv, GridViewWorkflows.RowCount)
                 If GridViewWorkflows.ActiveFilterString <> String.Empty Then
                     If Not lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
                         lblCaptionMainGrid.Text += $"|{oTermFilterActive}"
                     Else
                         Ev_Filter_Panel_Closed = False
                     End If
+                    bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                    bsitmCount.Caption = oTermFilterActive
+                Else
+                    bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                 End If
 
             End If
@@ -3260,6 +3266,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
     Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter
         GridLayout_Changed("GridViewWFItems_SubstituteFilter")
+
     End Sub
 
     Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick
@@ -3292,7 +3299,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
                     LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
 
-                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
+                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True)
                     If oResult = True Then
                         WM_AHWF_docPath = oTargetPath
                         Dim oDocID = WINDREAM_MOD.NewDocumentID
diff --git a/app/TaskFlow/frmMassValidator.vb b/app/TaskFlow/frmMassValidator.vb
index b4e3807..332faec 100644
--- a/app/TaskFlow/frmMassValidator.vb
+++ b/app/TaskFlow/frmMassValidator.vb
@@ -323,7 +323,7 @@ Public Class frmMassValidator
                             lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
                             lookup.Properties.MultiSelect = oMultiselect
 
-                            If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
+                            If ClassAllgemeineFunktionen.NotNullString(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
                                 lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
                             End If
 
@@ -449,7 +449,7 @@ Public Class frmMassValidator
                 End If
                 Dim idxname As String = controlRow.Item("INDEX_NAME")
                 ' Wenn kein defaultValue existiert, leeren String setzen
-                Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty)
+                Dim defaultValue As String = ClassAllgemeineFunktionen.NotNullString(controlRow.Item("DEFAULT_VALUE"), String.Empty)
                 indexname = idxname
                 Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE")
                 LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString)
@@ -474,7 +474,7 @@ Public Class frmMassValidator
                                 If wertWD = "" And defaultValue <> "" Then
                                     oControl.Text = defaultValue
                                 Else
-                                    oControl.Text = NotNull(wertWD, defaultValue)
+                                    oControl.Text = ClassAllgemeineFunktionen.NotNullString(wertWD, defaultValue)
                                 End If
 
                             End If
diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb
index 6a11584..ff6b658 100644
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
@@ -2676,7 +2676,7 @@ Public Class frmValidator
 
                 ' ############ Infos eintragen #################
 
-                If Amount_Docs2Validate >= 1 Then
+                If Amount_Docs2Validate > 1 Then
                     Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
                     bsiInformation.Caption = omsg
 
diff --git a/app/TaskFlow/frmValidatorSearch.Designer.vb b/app/TaskFlow/frmValidatorSearch.Designer.vb
index f15b712..b45da71 100644
--- a/app/TaskFlow/frmValidatorSearch.Designer.vb
+++ b/app/TaskFlow/frmValidatorSearch.Designer.vb
@@ -313,9 +313,11 @@ Partial Class frmValidatorSearch
         '
         'DocumentViewer1
         '
+        Me.DocumentViewer1.BackColor = System.Drawing.SystemColors.ControlLightLight
         resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
         Me.DocumentViewer1.FileLoaded = False
         Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
         '
         'SplitContainerSearches
         '
diff --git a/app/TaskFlow/frmValidatorSearch.resx b/app/TaskFlow/frmValidatorSearch.resx
index f85acc3..bd2d0a9 100644
--- a/app/TaskFlow/frmValidatorSearch.resx
+++ b/app/TaskFlow/frmValidatorSearch.resx
@@ -138,7 +138,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 559</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -187,7 +187,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 559</value>
   </data>
   <data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -229,7 +229,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 559</value>
   </data>
   <data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -271,7 +271,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 559</value>
   </data>
   <data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -313,7 +313,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 373</value>
+    <value>349, 559</value>
   </data>
   <data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -382,7 +382,7 @@
     <value>0, 0</value>
   </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>286, 582</value>
+    <value>464, 582</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -391,7 +391,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.3.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainerControlDoc.Panel2</value>
@@ -415,7 +415,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControlDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>647, 582</value>
+    <value>825, 582</value>
   </data>
   <data name="SplitContainerControlDoc.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -451,7 +451,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>383, 562</value>
   </data>
   <data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -469,7 +469,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>383, 562</value>
   </data>
   <data name="XtraTabPageSearch1.Text" xml:space="preserve">
     <value>Search1</value>
@@ -487,7 +487,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabControlSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>563, 585</value>
+    <value>385, 585</value>
   </data>
   <data name="XtraTabControlSQL.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -499,7 +499,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>447, 562</value>
   </data>
   <data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -517,7 +517,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>447, 562</value>
   </data>
   <data name="XtraTabPageSearch2.Text" xml:space="preserve">
     <value>Search2</value>
@@ -541,7 +541,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>447, 562</value>
   </data>
   <data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -559,7 +559,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>447, 562</value>
   </data>
   <data name="XtraTabPageSearch3.Text" xml:space="preserve">
     <value>XtraTabPage1</value>
@@ -583,7 +583,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>447, 562</value>
   </data>
   <data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -601,7 +601,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>447, 562</value>
   </data>
   <data name="XtraTabPageSearch4.Text" xml:space="preserve">
     <value>XtraTabPage2</value>
@@ -625,7 +625,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>374, 375</value>
+    <value>447, 562</value>
   </data>
   <data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -643,7 +643,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>561, 562</value>
+    <value>447, 562</value>
   </data>
   <data name="XtraTabPageSearch5.Text" xml:space="preserve">
     <value>XtraTabPage3</value>
@@ -688,7 +688,7 @@
     <value>0, 585</value>
   </data>
   <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>563, 22</value>
+    <value>385, 22</value>
   </data>
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -742,7 +742,7 @@
     <value>0, 582</value>
   </data>
   <data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>647, 25</value>
+    <value>825, 25</value>
   </data>
   <data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -855,7 +855,7 @@
   <data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE
+        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACbElE
         QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
         EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
         R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
@@ -922,7 +922,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYdJREFUOE+NkG0rQ2Ec
         h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
         XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
         drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR
diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb
index 2eb1841..d46e8ab 100644
--- a/app/TaskFlow/frmValidatorSearch.vb
+++ b/app/TaskFlow/frmValidatorSearch.vb
@@ -462,6 +462,17 @@ Public Class frmValidatorSearch
     End Sub
 
     Private Sub frmValidatorSearch_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        Try
+            Me.Location = My.Settings.frmValidatorSearchPosition
+            If Me.Size.Height > 100 And Me.Size.Width > 100 Then
+                Me.Size = My.Settings.frmValidatorSearchSize
+            End If
+            SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
+
+
         formLoaded = True
     End Sub