Zooflow: Custom Searches

2022-06-08 16:31:34 +02:00 · 2022-06-08 16:31:34 +02:00 · d5b9cae282
commit d5b9cae282
parent bd136bf6be
22 changed files with 1024 additions and 283 deletions
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@ -576,5 +576,8 @@
  <ItemGroup>
    <None Include="Resources\saveas.svg" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\bo_security_permission_action.svg" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/GUIs.Common/IResultForm.vb
+++ b/GUIs.Common/IResultForm.vb
@ -4,7 +4,6 @@ Public Interface IResultForm
    Property OperationMode As OperationMode
    Property ShouldReturnToPreviousForm As Boolean
    Event NeedsRefresh As EventHandler(Of Integer)
    Function RefreshResults(pResults As IEnumerable(Of BaseResult)) As Boolean
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -180,6 +180,16 @@ Namespace My.Resources
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
        Friend ReadOnly Property bo_security_permission_action() As DevExpress.Utils.Svg.SvgImage
            Get
                Dim obj As Object = ResourceManager.GetObject("bo_security_permission_action", resourceCulture)
                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -121,9 +121,6 @@
  <data name="bo_transition" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_transition.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="editcolors" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="security_unlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\security_unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -148,6 +145,12 @@
  <data name="ZooFlow-Vergroessern" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="grid" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\grid.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -157,9 +160,6 @@
  <data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="autoarrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\autoarrange1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -190,6 +190,12 @@
  <data name="refreshallpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="enablescrolling" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -202,11 +208,8 @@
  <data name="singlepageview1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_contract" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="bo_localization" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_contract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\bo_localization.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -220,6 +223,9 @@
  <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearall" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearall1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -229,17 +235,17 @@
  <data name="categorize" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="bo_contract" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\bo_contract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="saveas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\saveas.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="title" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="editcolors" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -247,11 +253,11 @@
  <data name="actions_user" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_user1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="filterquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\filterquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@ -274,15 +280,12 @@
  <data name="handtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\handtool1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bo_localization" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_localization.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="business_world" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -292,7 +295,7 @@
  <data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="saveas" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="bo_security_permission_action" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\saveas.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\bo_security_permission_action.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/GUIs.Common/Resources/bo_security_permission_action.svg
+++ b/GUIs.Common/Resources/bo_security_permission_action.svg
@ -0,0 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
  <style type="text/css">
 	.Green{fill:#039C23;}
 </style>
  <path d="M14,24c0-5.5,4.5-10,10-10c0.7,0,1.3,0.1,1.9,0.2c0-0.4,0.1-0.8,0.1-1.2c0-7.2-5.8-13-13-13S0,5.8,0,13  s5.8,13,13,13c0.4,0,0.8,0,1.2-0.1C14.1,25.3,14,24.7,14,24z M9.3,18.6V7.4l9.3,5.6L9.3,18.6z" class="Green" />
  <path d="M24,16c-4.4,0-8,3.6-8,8s3.6,8,8,8s8-3.6,8-8S28.4,16,24,16z M22.5,28L19,24.5l1.5-1.5l2,2l5-5l1.5,1.5  L22.5,28z" class="Green" />
 </svg>
--- a/GUIs.Common/frmDocumentResultList.Designer.vb
+++ b/GUIs.Common/frmDocumentResultList.Designer.vb
@ -66,18 +66,21 @@ Partial Class frmDocumentResultList
        Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem()
        Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
        Me.btnSaveWorkspaceAs = New DevExpress.XtraBars.BarButtonItem()
        Me.btnSaveAsMySearch = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageRefresh = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupDocument = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupCheckInOut = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupWorkflow = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupAttribute = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupWorkspace = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupSavedSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupWorkspaceSettings = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
        Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
@ -112,7 +115,6 @@ Partial Class frmDocumentResultList
        Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog()
        Me.DockPanelPreview = New DevExpress.XtraBars.Docking.DockPanel()
        Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControl1.Panel1.SuspendLayout()
@ -215,11 +217,12 @@ Partial Class frmDocumentResultList
        '
        'RibbonControl
        '
        Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
        Me.RibbonControl.ExpandCollapseItem.Id = 0
        Me.RibbonControl.Images = Me.SvgImageCollection1
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarEditItemGridFontSize, Me.btnSaveWorkspace, Me.BarWorkspaceMenuItem1, Me.btnSaveWorkspaceAs, Me.btnSaveAsMySearch})
        resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 57
+        Me.RibbonControl.MaxItemId = 59
        Me.RibbonControl.Name = "RibbonControl"
        Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
        Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2})
@ -510,9 +513,16 @@ Partial Class frmDocumentResultList
        Me.btnSaveWorkspaceAs.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.saveas
        Me.btnSaveWorkspaceAs.Name = "btnSaveWorkspaceAs"
        '
        'btnSaveAsMySearch
        '
        resources.ApplyResources(Me.btnSaveAsMySearch, "btnSaveAsMySearch")
        Me.btnSaveAsMySearch.Id = 57
        Me.btnSaveAsMySearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.bo_security_permission_action
        Me.btnSaveAsMySearch.Name = "btnSaveAsMySearch"
        '
        'RibbonPageStart
        '
-        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageGroup5, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace})
+        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch})
        Me.RibbonPageStart.Name = "RibbonPageStart"
        resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart")
        '
@ -530,12 +540,12 @@ Partial Class frmDocumentResultList
        Me.RibbonPageGroupExport.Name = "RibbonPageGroupExport"
        resources.ApplyResources(Me.RibbonPageGroupExport, "RibbonPageGroupExport")
        '
-        'RibbonPageGroup5
+        'RibbonPageRefresh
        '
-        Me.RibbonPageGroup5.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageRefresh.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup5.ItemLinks.Add(Me.ButtonRefresh)
+        Me.RibbonPageRefresh.ItemLinks.Add(Me.ButtonRefresh)
-        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
+        Me.RibbonPageRefresh.Name = "RibbonPageRefresh"
-        resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5")
+        resources.ApplyResources(Me.RibbonPageRefresh, "RibbonPageRefresh")
        '
        'RibbonPageGroupDocument
        '
@ -577,6 +587,12 @@ Partial Class frmDocumentResultList
        Me.RibbonPageGroupWorkspace.Name = "RibbonPageGroupWorkspace"
        resources.ApplyResources(Me.RibbonPageGroupWorkspace, "RibbonPageGroupWorkspace")
        '
        'RibbonPageGroupSavedSearch
        '
        Me.RibbonPageGroupSavedSearch.ItemLinks.Add(Me.btnSaveAsMySearch)
        Me.RibbonPageGroupSavedSearch.Name = "RibbonPageGroupSavedSearch"
        resources.ApplyResources(Me.RibbonPageGroupSavedSearch, "RibbonPageGroupSavedSearch")
        '
        'RibbonPage2
        '
        Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup9, Me.RibbonPageGroup1, Me.RibbonPageGroupWorkspaceSettings})
@ -592,6 +608,14 @@ Partial Class frmDocumentResultList
        Me.RibbonPageGroup9.Name = "RibbonPageGroup9"
        resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9")
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.SwitchDetailContainerHorizontal)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.SwitchMainContainerHorizontal)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarEditItemGridFontSize)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
        resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
        '
        'RibbonPageGroupWorkspaceSettings
        '
        Me.RibbonPageGroupWorkspaceSettings.ItemLinks.Add(Me.btnSaveWorkspace)
@ -874,14 +898,6 @@ Partial Class frmDocumentResultList
        resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container")
        Me.DockPanel1_Container.Name = "DockPanel1_Container"
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.SwitchDetailContainerHorizontal)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.SwitchMainContainerHorizontal)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarEditItemGridFontSize)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
        resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
        '
        'frmDocumentResultList
        '
        Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
@ -992,7 +1008,7 @@ Partial Class frmDocumentResultList
    Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroupDocument As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonPageGroupFilesystem As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageRefresh As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager
    Friend WithEvents DockPanelPreview As DevExpress.XtraBars.Docking.DockPanel
@ -1037,4 +1053,6 @@ Partial Class frmDocumentResultList
    Friend WithEvents btnSaveWorkspaceAs As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroupWorkspace As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents btnSaveAsMySearch As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroupSavedSearch As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class
--- a/GUIs.Common/frmDocumentResultList.resx
+++ b/GUIs.Common/frmDocumentResultList.resx
@ -522,7 +522,7 @@
    <value>DocumentViewer1</value>
  </data>
  <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.7.0.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
    <value>DockPanel1_Container</value>
@ -717,7 +717,7 @@
    <value>CtrlObjectPropertyDialog</value>
  </data>
  <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
-    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.12.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.12.1.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
    <value>DockPanel3_Container</value>
@ -1177,6 +1177,12 @@
  <data name="&gt;&gt;btnSaveWorkspaceAs.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;btnSaveAsMySearch.Name" xml:space="preserve">
    <value>btnSaveAsMySearch</value>
  </data>
  <data name="&gt;&gt;btnSaveAsMySearch.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;RibbonPageStart.Name" xml:space="preserve">
    <value>RibbonPageStart</value>
  </data>
@ -1195,10 +1201,10 @@
  <data name="&gt;&gt;RibbonPageGroupExport.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;RibbonPageGroup5.Name" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageRefresh.Name" xml:space="preserve">
-    <value>RibbonPageGroup5</value>
+    <value>RibbonPageRefresh</value>
  </data>
-  <data name="&gt;&gt;RibbonPageGroup5.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageRefresh.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupDocument.Name" xml:space="preserve">
@ -1237,6 +1243,12 @@
  <data name="&gt;&gt;RibbonPageGroupWorkspace.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupSavedSearch.Name" xml:space="preserve">
    <value>RibbonPageGroupSavedSearch</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupSavedSearch.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
    <value>RibbonPage2</value>
  </data>
@ -1249,6 +1261,12 @@
  <data name="&gt;&gt;RibbonPageGroup9.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
    <value>RibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroupWorkspaceSettings.Name" xml:space="preserve">
    <value>RibbonPageGroupWorkspaceSettings</value>
  </data>
@ -1345,12 +1363,6 @@
  <data name="&gt;&gt;EmptySpaceItem1.Type" xml:space="preserve">
    <value>DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
    <value>RibbonPageGroup1</value>
  </data>
  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmDocumentResultList</value>
  </data>
@ -1360,6 +1372,9 @@
  <data name="btnSaveWorkspaceAs.Caption" xml:space="preserve">
    <value>Speichern unter</value>
  </data>
  <data name="btnSaveAsMySearch.Caption" xml:space="preserve">
    <value>Als meine Suche speichern</value>
  </data>
  <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
@ -1369,7 +1384,7 @@
  <data name="RibbonPageGroupExport.Text" xml:space="preserve">
    <value>Export</value>
  </data>
-  <data name="RibbonPageGroup5.Text" xml:space="preserve">
+  <data name="RibbonPageRefresh.Text" xml:space="preserve">
    <value>Aktualisieren</value>
  </data>
  <data name="RibbonPageGroupDocument.Text" xml:space="preserve">
@ -1390,6 +1405,9 @@
  <data name="RibbonPageGroupWorkspace.Text" xml:space="preserve">
    <value>Workspaces</value>
  </data>
  <data name="RibbonPageGroupSavedSearch.Text" xml:space="preserve">
    <value>Suche</value>
  </data>
  <data name="RibbonPageStart.Text" xml:space="preserve">
    <value>Start</value>
  </data>
--- a/GUIs.Common/frmDocumentResultList.vb
+++ b/GUIs.Common/frmDocumentResultList.vb
@ -65,6 +65,12 @@ Public Class frmDocumentResultList
    Private ReadOnly ColumnDocumentId As String = "DocID"
    Private ReadOnly ColumnIcon As String = "ICON"
    Private ReadOnly ColumnCheckedOut As String = "CHECKED_OUT"
    Private ReadOnly FontSizeDeltaList As New List(Of FontSetting) From {
        New FontSetting With {.Title = "Normal", .Value = 0},
        New FontSetting With {.Title = "Groß", .Value = 1},
        New FontSetting With {.Title = "Größer", .Value = 2},
        New FontSetting With {.Title = "Noch Größer", .Value = 3}
    }
    Private Property _ActiveGrid As GridControl = Nothing
    Private Property _ActiveGridBand As GridBand = Nothing
@ -81,6 +87,9 @@ Public Class frmDocumentResultList
    Public Event NeedsRefresh As EventHandler(Of Integer) Implements IResultForm.NeedsRefresh
    Public Event ResultsRefreshed As EventHandler(Of List(Of DocumentResultList.DocumentResult))
    Public Event NeedsNewSavedSearch As EventHandler
    Public Event SearchSaved As EventHandler
    Private Delegate Sub DatasourceDelegate(View As GridView, Datasource As Object)
    Private Delegate Function RefreshResultsDelegate(Results As IEnumerable(Of BaseResult)) As Boolean
@ -163,15 +172,9 @@ Public Class frmDocumentResultList
                RibbonPageGroupFilesystem.Visible = False
            End If
            Dim oFontSizeDeltaList = New List(Of FontSetting) From {
                New FontSetting With {.Title = "Normal", .Value = 0},
                New FontSetting With {.Title = "Groß", .Value = 1},
                New FontSetting With {.Title = "Größer", .Value = 2},
                New FontSetting With {.Title = "Noch Größer", .Value = 3}
            }
            cmbGridFontSize.Items.Clear()
-            cmbGridFontSize.Items.AddRange(oFontSizeDeltaList)
+            cmbGridFontSize.Items.AddRange(FontSizeDeltaList)
-            BarEditItemGridFontSize.EditValue = oFontSizeDeltaList.
+            BarEditItemGridFontSize.EditValue = FontSizeDeltaList.
                Where(Function(delta) delta.Value = Config.Config.GridFontSizeDelta).
                FirstOrDefault()
@ -185,6 +188,13 @@ Public Class frmDocumentResultList
                RibbonPageGroupFilesystem.Visible = False
            End If
            chkGridShowQuickfilter.Checked = LayoutManager.GetFilterRowVisible()
            chkGridShowGrouping.Checked = LayoutManager.GetGroupPanelVisible()
            chkGridShowTitle.Checked = LayoutManager.GetBandTitleVisible()
            ' Hide the complete Navigation Ribbon Group if desired
            RibbonPageGroup_Navigation.Visible = Params.ShowBackNavigation
            If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then
                CtrlObjectPropertyDialog.Initialize(LogConfig, Me, Client, Environment)
@ -196,12 +206,10 @@ Public Class frmDocumentResultList
                panelContainerStatus.Visibility = Docking.DockVisibility.Hidden
            End If
            ' Hide the complete Navigation Ribbon Group if desired
            RibbonPageGroup_Navigation.Visible = Params.ShowBackNavigation
            UpdateTotalResults()
            LoadGridDataAndLayout()
            ' Initialize Grid Settings
            GridBuilder.WithReadOnlyOptions()
            ' Force initialize, this is needed so that grid settings are loaded correctly from the workspace
@ -221,10 +229,6 @@ Public Class frmDocumentResultList
            ' This loads the default workspace, for now
            Workspace.LoadWorkspace(Config.Config.SelectedWorkspace)
            chkGridShowQuickfilter.Checked = LayoutManager.GetFilterRowVisible()
            chkGridShowGrouping.Checked = LayoutManager.GetGroupPanelVisible()
            chkGridShowTitle.Checked = LayoutManager.GetBandTitleVisible()
            ' This needs to done be after loading the grid
            ' so we can set the row handle and start loading the (only) file
            If Params.ShowFileList = False Then
@ -234,6 +238,22 @@ Public Class frmDocumentResultList
                DockPanelFileList.Show()
            End If
            ' Hide the refresh button when nobody handles the refresh event
            If NeedsRefreshEvent IsNot Nothing Then
                RibbonPageRefresh.Visible = True
            Else
                RibbonPageRefresh.Visible = False
            End If
            ' Hide the saved search button when nobody handles the saved search event
            If NeedsNewSavedSearchEvent IsNot Nothing Then
                RibbonPageGroupSavedSearch.Visible = True
            Else
                RibbonPageGroupSavedSearch.Visible = False
            End If
        Catch ex As Exception
            FormHelper.ShowErrorMessage(ex, "Error while loading results")
@ -243,21 +263,8 @@ Public Class frmDocumentResultList
        End Try
    End Sub
    Public Class FontSetting
        Public Property Title As String
        Public Property Value As Integer
        Public Overrides Function ToString() As String
            Return Title
        End Function
    End Class
    Private Sub frmDocumentResultList_Closing(sender As Object, e As CancelEventArgs) Handles Me.FormClosing
        Try
            'LayoutManager.GridView_SaveLayout(_ActiveGrid.MainView)
            'LayoutManager.Workspace_Save(WorkspaceManager1)
            'LayoutManager.DockManager_SaveLayout(DockManager1)
            LayoutManager.SaveWindowLocationAndSize(Me)
            Workspace.SaveWorkspaces()
@ -1086,4 +1093,19 @@ Public Class frmDocumentResultList
            Workspace.LoadWorkspace(oWorkspaceName)
        End If
    End Sub
    Private Sub btnSaveAsMySearch_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnSaveAsMySearch.ItemClick
        RaiseEvent NeedsNewSavedSearch(Me, New EventArgs)
    End Sub
    Public Class FontSetting
        Public Property Title As String
        Public Property Value As Integer
        Public Overrides Function ToString() As String
            Return Title
        End Function
    End Class
 End Class
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -600,6 +600,26 @@ Namespace My.Resources
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
        Friend ReadOnly Property alignhorizontalcenter() As DevExpress.Utils.Svg.SvgImage
            Get
                Dim obj As Object = ResourceManager.GetObject("alignhorizontalcenter", resourceCulture)
                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
        Friend ReadOnly Property alignverticalcenter() As DevExpress.Utils.Svg.SvgImage
            Get
                Dim obj As Object = ResourceManager.GetObject("alignverticalcenter", resourceCulture)
                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
            End Get
        End Property
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -214,6 +214,9 @@
  <data name="text" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\text.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bo_security_permission_action" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_security_permission_action.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="viewmergeddata" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -238,9 +241,6 @@
  <data name="Flow" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="unlink" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\unlink.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -316,6 +316,9 @@
  <data name="save5" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="alignverticalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="updatedataextract" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -442,8 +445,8 @@
  <data name="definednameuseinformula1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="unlink" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\unlink.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -502,8 +505,8 @@
  <data name="doublenext2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="Compare_RefreshScriptPreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="new3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\new3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@ -541,6 +544,9 @@
  <data name="StatusAnnotations_Information_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Compare_RefreshScriptPreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@ -652,7 +658,7 @@
  <data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_security_permission_action" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_security_permission_action.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@ -1,22 +1,23 @@
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/GUIs.ZooFlow/Resources/alignhorizontalcenter.svg
+++ b/GUIs.ZooFlow/Resources/alignhorizontalcenter.svg
@ -0,0 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
  <style type="text/css">
 	.Black{fill:#727272;}
 	.Green{fill:#039C23;}
 </style>
  <path d="M31,0H1C0.5,0,0,0.5,0,1v30c0,0.5,0.5,1,1,1h30c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,30H2V2h28V30z" class="Black" />
  <rect x="4" y="12" width="24" height="8" rx="0" ry="0" class="Green" />
 </svg>
--- a/GUIs.ZooFlow/Resources/alignverticalcenter.svg
+++ b/GUIs.ZooFlow/Resources/alignverticalcenter.svg
@ -0,0 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
  <style type="text/css">
 	.Black{fill:#727272;}
 	.Green{fill:#039C23;}
 </style>
  <path d="M31,0H1C0.5,0,0,0.5,0,1v30c0,0.5,0.5,1,1,1h30c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,30H2V2h28V30z" class="Black" />
  <rect x="12" y="4" width="8" height="24" rx="0" ry="0" class="Green" />
 </svg>
--- a/GUIs.ZooFlow/Search/SavedSearch.vb
+++ b/GUIs.ZooFlow/Search/SavedSearch.vb
@ -0,0 +1,48 @@
 Imports System.Xml.Serialization
 Imports DevExpress.Utils.Svg
 Namespace SavedSearch
    Public MustInherit Class SavedSearch
        Public Property Name As String
        Public Property Description As String
        Public Overridable Property GroupText As String = ""
        Public Property Image As SvgImage
        Public ReadOnly Property DisplayName As String
            Get
                Return Name
            End Get
        End Property
    End Class
    Public Class PredefinedDateSearch
        Inherits SavedSearch
        'Public Property Image As SvgImage
        Public Overrides Property GroupText As String = "Vordefiniert"
        Public Property DateConstraint As Search.SearchRunner.DateConstraint
    End Class
    Public Class CustomSearch
        Inherits SavedSearch
        'Public Property Image As SvgImage
        Public Overrides Property GroupText As String = "Eigene"
        Public Tokens As New List(Of Search.SearchToken.Token)
    End Class
    <XmlInclude(GetType(Search.SearchToken.Token))>
    <XmlInclude(GetType(Search.SearchToken.AttributeValueToken))>
    <XmlInclude(GetType(Search.SearchToken.ValueOnlyToken))>
    Public Class CustomSearchSerializable
        Public Property Name As String
        Public Property Description As String
        Public Property ImageName As String
        Public Property GroupText As String
        Public Property Tokens As New List(Of Search.SearchToken.Token)
    End Class
 End Namespace
--- a/GUIs.ZooFlow/Search/SearchLoader.vb
+++ b/GUIs.ZooFlow/Search/SearchLoader.vb
@ -8,23 +8,26 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports System.Reflection
 Namespace Search
    Public Class SearchLoader
        Inherits BaseClass
-        Private Const CUSTOM_SEARCH_DIRECTORY = ""
+        Private Const CUSTOM_SEARCH_DIRECTORY = "Searches"
        Private ReadOnly Images As SvgImageCollection
-        Private ReadOnly Config As ConfigManager(Of UIConfig)
+        Private ReadOnly ImageTable As List(Of ImageTableItem)
        'Private ReadOnly Serializer As New XmlSerializer(GetType(CustomSearch))
-        Public Property CustomSearches As List(Of CustomSearch)
+        Private ReadOnly Config As ConfigManager(Of SystemConfig)
        Private ReadOnly Serializer As XmlSerializer
-        Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of UIConfig), pSvgImages As SvgImageCollection)
+        Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of SystemConfig), pSvgImages As SvgImageCollection)
            MyBase.New(pLogConfig)
            Images = pSvgImages
            ImageTable = GetImageTable(pSvgImages)
            Config = pConfig
            Serializer = New XmlSerializer(GetType(SavedSearch.CustomSearchSerializable))
        End Sub
        Private Function GetSearchDirectoryPath() As String
@ -43,23 +46,27 @@ Namespace Search
        End Function
        Public Sub CreateCustomSearch(pTitle As String, pDescription As String, pTokens As List(Of Token), pImage As String)
-            Dim oSearch As New CustomSearch With {
+            Dim oSearch As New SavedSearch.CustomSearch With {
                .Name = pTitle,
                .Description = pDescription,
                .Tokens = pTokens,
                .Image = Images.Item(pImage)
            }
            CustomSearches.Add(oSearch)
-            'Dim oDirectoryPath As String = GetSearchDirectoryPath()
+            Try
-            'Dim oFilePath As String = IO.Path.Combine(oDirectoryPath, Utils.ConvertTextToSlug(pTitle))
+                Dim oDirectoryPath As String = GetSearchDirectoryPath()
-            'Dim oBuffer As Byte() = SerializeSearch(oSearch)
+                Dim oFilePath As String = IO.Path.Combine(oDirectoryPath, Utils.ConvertTextToSlug(pTitle) & ".xml")
                Dim oBuffer As Byte() = SerializeSearch(oSearch)
-            'IO.File.WriteAllBytes(oFilePath, oBuffer)
+                File.WriteAllBytes(oFilePath, oBuffer)
            Catch ex As Exception
                Logger.Warn("Custom Search could not be saved!")
                Logger.Error(ex)
            End Try
        End Sub
-        Public Function LoadSearches() As List(Of SavedSearch)
+        Public Function LoadSearches() As List(Of SavedSearch.SavedSearch)
-            Dim oSearches As New List(Of SavedSearch)
+            Dim oSearches As New List(Of SavedSearch.SavedSearch)
            Dim oCustomSearches = LoadCustomSearches()
            Dim oPredefinedSearches = LoadPredefinedSearches()
@ -69,49 +76,60 @@ Namespace Search
                ToList()
        End Function
-        Public Function LoadCustomSearches() As List(Of SavedSearch)
+        Public Function LoadCustomSearches() As List(Of SavedSearch.SavedSearch)
-            Return New List(Of SavedSearch)
+            Dim oSearches As New List(Of SavedSearch.SavedSearch)
            Dim oPath = GetSearchDirectoryPath()
            Dim oFiles = Directory.GetFiles(oPath, "*.xml")
            For Each oFile In oFiles
                Dim oBytes = File.ReadAllBytes(oFile)
                Dim oSearch = DeserializeSearch(oBytes)
                oSearches.Add(oSearch)
            Next
            Return oSearches
        End Function
-        Public Function LoadPredefinedSearches() As List(Of SavedSearch)
+        Public Function LoadPredefinedSearches() As List(Of SavedSearch.SavedSearch)
-            Return New List(Of SavedSearch) From {
+            Return New List(Of SavedSearch.SavedSearch) From {
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Heute",
                    .Description = "Dokumente, die heute abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.Today,
                    .Image = Images.Item("today")
                },
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Gestern",
                    .Description = "Dokumente, die gestern abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.Yesterday,
                    .Image = Images.Item("yesterday")
                },
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Letzte 7 Tage",
                    .Description = "Dokumente, die in den letzten 7 Tagen abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.Last7Days,
                    .Image = Images.Item("week")
                },
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Dieser Monat",
                    .Description = "Dokumente, die in diesem Monat abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.CurrentMonth,
                    .Image = Images.Item("month")
                },
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Letzter Monat",
                    .Description = "Dokumente, die im letzten Monat abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.LastMonth,
                    .Image = Images.Item("month")
                },
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Dieses Jahr",
                    .Description = "Dokumente, die in diesem Jahr abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.CurrentYear,
                    .Image = Images.Item("year")
                },
-                New PredefinedDateSearch() With {
+                New SavedSearch.PredefinedDateSearch() With {
                    .Name = "Letztes Jahr",
                    .Description = "Dokumente, die im letzten Jahr abgelegt wurden",
                    .DateConstraint = SearchRunner.DateConstraint.LastYear,
@ -120,62 +138,86 @@ Namespace Search
            }
        End Function
-        'Private Function SerializeSearch(pSearch As CustomSearch) As Byte()
+        Private Function ConvertSvgImageToString(pImage As SvgImage) As String
-        '    Try
+            Dim oItem = ImageTable.Where(Function(item) item.Image.Equals(pImage)).FirstOrDefault()
-        '        Using oStream As New MemoryStream
+            If oItem Is Nothing Then
-        '            Serializer.Serialize(oStream, pSearch)
+                Return Nothing
-        '            Return oStream.ToArray()
+            End If
        '        End Using
        '    Catch ex As Exception
        '        Logger.Error(ex)
        '        Return Nothing
        '    End Try
        'End Function
-        'Private Function DeserializeSearch(pBytes As Byte()) As CustomSearch
+            Return oItem.Name
-        '    Try
+        End Function
        '        Using oStream As New MemoryStream(pBytes)
        '            Return Serializer.Deserialize(oStream)
        '        End Using
        '    Catch ex As Exception
        '        Logger.Error(ex)
        '        Return Nothing
        '    End Try
        'End Function
-        Public Class PredefinedSQLSearch
+        Private Function ConvertStringToImageName(pName As String) As SvgImage
-            Public Property SQLCommand As String
+            Dim oItem = ImageTable.Where(Function(item) item.Name.Equals(pName)).FirstOrDefault()
            If oItem Is Nothing Then
                Return Nothing
            End If
            Return oItem.Image
        End Function
        Private Function GetImageTable(pImageCollection As SvgImageCollection) As List(Of ImageTableItem)
            Dim oList As New List(Of ImageTableItem)
            For Each oImageName In pImageCollection.Keys
                Dim oSvgImage = pImageCollection.Item(oImageName)
                oList.Add(New ImageTableItem(oImageName, oSvgImage))
            Next
            Return oList
        End Function
        Private Function SerializeSearch(pSearch As SavedSearch.CustomSearch) As Byte()
            Try
                Dim oSearch As New SavedSearch.CustomSearchSerializable With {
                    .Name = pSearch.Name,
                    .Description = pSearch.Description,
                    .GroupText = pSearch.GroupText,
                    .Tokens = pSearch.Tokens,
                    .ImageName = ConvertSvgImageToString(pSearch.Image)
                }
                Using oStream As New MemoryStream
                    Serializer.Serialize(oStream, oSearch)
                    Return oStream.ToArray()
                End Using
            Catch ex As Exception
                Logger.Error(ex)
                Return Nothing
            End Try
        End Function
        Private Function DeserializeSearch(pBytes As Byte()) As SavedSearch.CustomSearch
            Try
                Using oStream As New MemoryStream(pBytes)
                    Dim oSearch As SavedSearch.CustomSearchSerializable = Serializer.Deserialize(oStream)
                    Return New SavedSearch.CustomSearch With {
                        .Name = oSearch.Name,
                        .Description = oSearch.Description,
                        .GroupText = oSearch.GroupText,
                        .Tokens = oSearch.Tokens,
                        .Image = ConvertStringToImageName(oSearch.ImageName)
                    }
                End Using
            Catch ex As Exception
                Logger.Error(ex)
                Return Nothing
            End Try
        End Function
        Private Class ImageTableItem
            Public ReadOnly Name As String
            Public ReadOnly Image As SvgImage
            Public Sub New(pName As String, pImage As SvgImage)
                Name = pName
                Image = pImage
            End Sub
        End Class
        Public Class PredefinedDateSearch
            Inherits SavedSearch
            Public Overrides Property GroupText As String = "Vordefiniert"
            Public Property DateConstraint As SearchRunner.DateConstraint
        End Class
        Public Class CustomSearch
            Inherits SavedSearch
            Public Overrides Property GroupText As String = "Eigene"
            Public Tokens As New List(Of Token)
        End Class
        Public MustInherit Class SavedSearch
            Public Property Name As String
            Public Property Description As String
            Public Property Image As SvgImage
            Public Property Count As Integer = 0
            Public Overridable Property GroupText As String = "Vordefiniert"
            Public ReadOnly Property DisplayName As String
                Get
                    Return Name
                End Get
            End Property
        End Class
    End Class
 End Namespace
--- a/GUIs.ZooFlow/Search/SearchRunner.vb
+++ b/GUIs.ZooFlow/Search/SearchRunner.vb
@ -37,6 +37,7 @@ Namespace Search
        End Enum
        Public Event NeedsRefresh As EventHandler(Of Integer)
        Public Event NeedsNewSavedSearch As EventHandler
        Public Event Closed As EventHandler(Of Integer)
        Private Property _ActiveDateConstraint As String = String.Empty
@ -78,9 +79,9 @@ Namespace Search
        Public Function RunWithDataTable(pDatatable As DataTable, pTitle As String) As SearchResult
            Dim oParams = GetParams(pTitle)
            oParams.Results.Add(New DocumentResultList.DocumentResult() With {
-            .Title = pTitle,
+                .Title = pTitle,
-            .Datatable = pDatatable
+                .Datatable = pDatatable
-        })
+            })
            If pDatatable.Rows.Count = 1 Then
                oParams.ShowFileList = False
@ -181,6 +182,16 @@ Namespace Search
                    'AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh
                    AddHandler oForm.FormClosed, AddressOf Form_Closed
                    ' Only setup event if it is actually used
                    If NeedsNewSavedSearchEvent IsNot Nothing Then
                        AddHandler oForm.NeedsNewSavedSearch, AddressOf Form_NeedsNewSavedSearch
                    End If
                    ' Only setup event if it is actually used
                    If NeedsRefreshEvent IsNot Nothing Then
                        AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh
                    End If
                    oForm.Show()
                    Return New SearchResult(oRowCount)
@ -194,6 +205,14 @@ Namespace Search
            End If
        End Function
        Private Sub Form_NeedsNewSavedSearch(sender As Object, e As EventArgs)
            RaiseEvent NeedsNewSavedSearch(sender, e)
        End Sub
        Private Sub Form_NeedsRefresh(sender As Object, e As Integer)
            RaiseEvent NeedsRefresh(sender, e)
        End Sub
        Private Async Function GetDateConstraint(pDateFrom As Date, pDateTo As Date) As Task(Of String)
            Dim oSimpleDateConstraint = $"{_ActiveDateAttribute}~{_ActiveDateConstraint}"
            Dim oExplicitConstraint = Await MaybeSetExplicitDateConstraint(pDateFrom, pDateTo)
--- a/GUIs.ZooFlow/Search/frmEditSearch.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmEditSearch.Designer.vb
@ -0,0 +1,232 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmEditSearch
    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
    'Form overrides dispose to clean up the component list.
    <System.Diagnostics.DebuggerNonUserCode()> _
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        If disposing AndAlso components IsNot Nothing Then
            components.Dispose()
        End If
        MyBase.Dispose(disposing)
    End Sub
    'Required by the Windows Form Designer
    Private components As System.ComponentModel.IContainer
    'NOTE: The following procedure is required by the Windows Form Designer
    'It can be modified using the Windows Form Designer.  
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
        Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
        Me.ImageComboBoxEdit1 = New DevExpress.XtraEditors.ImageComboBoxEdit()
        Me.TextEdit2 = New DevExpress.XtraEditors.MemoEdit()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.LayoutControl1.SuspendLayout()
        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ImageComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl1
        '
        Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
        Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
        Me.RibbonControl1.MaxItemId = 2
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
        Me.RibbonControl1.ShowToolbarCustomizeItem = False
        Me.RibbonControl1.Size = New System.Drawing.Size(422, 63)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
        '
        'BarButtonItem1
        '
        Me.BarButtonItem1.Caption = "Speichern"
        Me.BarButtonItem1.Id = 1
        Me.BarButtonItem1.Name = "BarButtonItem1"
        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "RibbonPage1"
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
        Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 301)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
        Me.RibbonStatusBar1.Size = New System.Drawing.Size(422, 24)
        '
        'RibbonPage2
        '
        Me.RibbonPage2.Name = "RibbonPage2"
        Me.RibbonPage2.Text = "RibbonPage2"
        '
        'LayoutControl1
        '
        Me.LayoutControl1.Controls.Add(Me.TextEdit1)
        Me.LayoutControl1.Controls.Add(Me.ImageComboBoxEdit1)
        Me.LayoutControl1.Controls.Add(Me.TextEdit2)
        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.LayoutControl1.Location = New System.Drawing.Point(0, 63)
        Me.LayoutControl1.Name = "LayoutControl1"
        Me.LayoutControl1.Root = Me.Root
        Me.LayoutControl1.Size = New System.Drawing.Size(422, 238)
        Me.LayoutControl1.TabIndex = 2
        Me.LayoutControl1.Text = "LayoutControl1"
        '
        'TextEdit1
        '
        Me.TextEdit1.Location = New System.Drawing.Point(96, 20)
        Me.TextEdit1.MenuManager = Me.RibbonControl1
        Me.TextEdit1.Name = "TextEdit1"
        Me.TextEdit1.Size = New System.Drawing.Size(306, 20)
        Me.TextEdit1.StyleController = Me.LayoutControl1
        Me.TextEdit1.TabIndex = 4
        '
        'ImageComboBoxEdit1
        '
        Me.ImageComboBoxEdit1.Location = New System.Drawing.Point(96, 198)
        Me.ImageComboBoxEdit1.MenuManager = Me.RibbonControl1
        Me.ImageComboBoxEdit1.Name = "ImageComboBoxEdit1"
        Me.ImageComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
        Me.ImageComboBoxEdit1.Size = New System.Drawing.Size(306, 20)
        Me.ImageComboBoxEdit1.StyleController = Me.LayoutControl1
        Me.ImageComboBoxEdit1.TabIndex = 6
        '
        'TextEdit2
        '
        Me.TextEdit2.Location = New System.Drawing.Point(96, 60)
        Me.TextEdit2.MenuManager = Me.RibbonControl1
        Me.TextEdit2.Name = "TextEdit2"
        Me.TextEdit2.Size = New System.Drawing.Size(306, 118)
        Me.TextEdit2.StyleController = Me.LayoutControl1
        Me.TextEdit2.TabIndex = 5
        '
        'Root
        '
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3})
        Me.Root.Name = "Root"
        Me.Root.Size = New System.Drawing.Size(422, 238)
        Me.Root.TextVisible = False
        '
        'LayoutControlItem1
        '
        Me.LayoutControlItem1.Control = Me.TextEdit1
        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem1.Name = "LayoutControlItem1"
        Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
        Me.LayoutControlItem1.Size = New System.Drawing.Size(402, 40)
        Me.LayoutControlItem1.Text = "Titel"
        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(64, 13)
        '
        'LayoutControlItem2
        '
        Me.LayoutControlItem2.Control = Me.TextEdit2
        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40)
        Me.LayoutControlItem2.Name = "LayoutControlItem2"
        Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
        Me.LayoutControlItem2.Size = New System.Drawing.Size(402, 138)
        Me.LayoutControlItem2.Text = "Beschreibung"
        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(64, 13)
        '
        'LayoutControlItem3
        '
        Me.LayoutControlItem3.Control = Me.ImageComboBoxEdit1
        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 178)
        Me.LayoutControlItem3.Name = "LayoutControlItem3"
        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
        Me.LayoutControlItem3.Size = New System.Drawing.Size(402, 40)
        Me.LayoutControlItem3.Text = "Icon"
        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(64, 13)
        '
        'SvgImageCollection1
        '
        Me.SvgImageCollection1.Add("today", "image://svgimages/scheduling/dayview.svg")
        Me.SvgImageCollection1.Add("month", "image://svgimages/scheduling/monthview.svg")
        Me.SvgImageCollection1.Add("week", "image://svgimages/scheduling/next7days.svg")
        Me.SvgImageCollection1.Add("year", "image://svgimages/scheduling/groupbynone.svg")
        Me.SvgImageCollection1.Add("yesterday", "image://svgimages/scheduling/today.svg")
        Me.SvgImageCollection1.Add("invoice", "image://svgimages/business objects/bo_invoice.svg")
        '
        'frmEditSearch
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(422, 325)
        Me.Controls.Add(Me.LayoutControl1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
        Me.Name = "frmEditSearch"
        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "frmEditSearch"
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.LayoutControl1.ResumeLayout(False)
        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.ImageComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
    End Sub
    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
    Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit
    Friend WithEvents ImageComboBoxEdit1 As DevExpress.XtraEditors.ImageComboBoxEdit
    Friend WithEvents TextEdit2 As DevExpress.XtraEditors.MemoEdit
    Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
 End Class
--- a/GUIs.ZooFlow/Search/frmEditSearch.resx
+++ b/GUIs.ZooFlow/Search/frmEditSearch.resx
@ -0,0 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
    Version 2.0
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple 
    name/value pairs.
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 
    mimetype set.
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
 </root>
--- a/GUIs.ZooFlow/Search/frmEditSearch.vb
+++ b/GUIs.ZooFlow/Search/frmEditSearch.vb
@ -0,0 +1,48 @@
 Imports DevExpress.Utils
 Imports DevExpress.Utils.Svg
 Public Class frmEditSearch
    Public ReadOnly Property Images As SvgImageCollection
        Get
            Return SvgImageCollection1
        End Get
    End Property
    Public Property IsNew As Boolean = False
    Public Property Title As String = ""
    Public Property Description As String = ""
    Public Property ImageString As String = ""
    Public Property Image As SvgImage = Nothing
    Private Sub frmEditSearch_Load(sender As Object, e As EventArgs) Handles Me.Load
        If IsNew Then
            Text = "Neue Suche"
        Else
            Text = "Suche bearbeiten"
        End If
        For Each oImage As SvgImageInfo In Images.ImageInfos
            Dim oItem = New DevExpress.XtraEditors.Controls.ImageComboBoxItem(oImage.Name, oImage.Bitmap)
            ImageComboBoxEdit1.Properties.Items.Add(oItem)
        Next
    End Sub
    Private Sub TextEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles TextEdit1.EditValueChanged
        Title = TextEdit1.EditValue
    End Sub
    Private Sub TextEdit2_EditValueChanged(sender As Object, e As EventArgs) Handles TextEdit2.EditValueChanged
        Description = TextEdit2.EditValue
    End Sub
    Private Sub ImageComboBoxEdit1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ImageComboBoxEdit1.SelectedIndexChanged
        ImageString = ImageComboBoxEdit1.Text
        'Image = ImageComboBoxEdit1.EditValue
    End Sub
    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
        DialogResult = DialogResult.OK
        Close()
    End Sub
 End Class
--- a/GUIs.ZooFlow/Search/frmSearchFlow.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmSearchFlow.Designer.vb
@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmSearchFlow
    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@ -20,7 +20,7 @@ Partial Class frmSearchFlow
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim ItemTemplate1 As DevExpress.XtraGrid.Views.Tile.ItemTemplate = New DevExpress.XtraGrid.Views.Tile.ItemTemplate()
@ -49,10 +49,17 @@ Partial Class frmSearchFlow
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
        Me.btnSaveSearch = New DevExpress.XtraBars.BarButtonItem()
        Me.chkGridVertical = New DevExpress.XtraBars.BarCheckItem()
        Me.chkGridHorizontal = New DevExpress.XtraBars.BarCheckItem()
        Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem()
        Me.RepositoryItemTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar()
        Me.BarEditItem2 = New DevExpress.XtraBars.BarEditItem()
        Me.RepositoryItemTrackBar2 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RepositoryItemMarqueeProgressBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemMarqueeProgressBar()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@ -80,6 +87,8 @@ Partial Class frmSearchFlow
        Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemTrackBar2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemMarqueeProgressBar1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.PanelControl1.SuspendLayout()
@ -137,12 +146,12 @@ Partial Class frmSearchFlow
        '
        Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblResults, Me.chkOperatorAnd, Me.chkOperatorOr, Me.chkDatefilter2, Me.BarCheckItem4, Me.chkSearchEverywhere, Me.BarButtonItem1, Me.BarButtonItem2, Me.btnSaveSearch})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblResults, Me.chkOperatorAnd, Me.chkOperatorOr, Me.chkDatefilter2, Me.BarCheckItem4, Me.chkSearchEverywhere, Me.BarButtonItem1, Me.BarButtonItem2, Me.btnSaveSearch, Me.chkGridVertical, Me.chkGridHorizontal, Me.BarEditItem1, Me.BarEditItem2})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 24
+        Me.RibbonControl1.MaxItemId = 28
        Me.RibbonControl1.Name = "RibbonControl1"
-        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
-        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemMarqueeProgressBar1})
+        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemMarqueeProgressBar1, Me.RepositoryItemTrackBar1, Me.RepositoryItemTrackBar2})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show
@ -168,6 +177,7 @@ Partial Class frmSearchFlow
        Me.chkOperatorAnd.Id = 16
        Me.chkOperatorAnd.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.link3
        Me.chkOperatorAnd.Name = "chkOperatorAnd"
        Me.chkOperatorAnd.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
        '
        'chkOperatorOr
        '
@ -176,6 +186,7 @@ Partial Class frmSearchFlow
        Me.chkOperatorOr.Id = 17
        Me.chkOperatorOr.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.unlink1
        Me.chkOperatorOr.Name = "chkOperatorOr"
        Me.chkOperatorOr.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
        '
        'chkDatefilter2
        '
@ -215,14 +226,58 @@ Partial Class frmSearchFlow
        '
        'btnSaveSearch
        '
-        Me.btnSaveSearch.Caption = "Aktuelle Eingabe als Suche speichern"
+        Me.btnSaveSearch.Caption = "Aktuelle Suche speichern"
        Me.btnSaveSearch.Id = 23
        Me.btnSaveSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_security_permission_action
        Me.btnSaveSearch.Name = "btnSaveSearch"
        '
        'chkGridVertical
        '
        Me.chkGridVertical.Caption = "Gruppen vertikal"
        Me.chkGridVertical.GroupIndex = 1
        Me.chkGridVertical.Id = 24
        Me.chkGridVertical.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.alignverticalcenter
        Me.chkGridVertical.Name = "chkGridVertical"
        '
        'chkGridHorizontal
        '
        Me.chkGridHorizontal.Caption = "Gruppen horizontal"
        Me.chkGridHorizontal.GroupIndex = 1
        Me.chkGridHorizontal.Id = 25
        Me.chkGridHorizontal.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.alignhorizontalcenter
        Me.chkGridHorizontal.Name = "chkGridHorizontal"
        '
        'BarEditItem1
        '
        Me.BarEditItem1.Caption = "Zeilen"
        Me.BarEditItem1.Edit = Me.RepositoryItemTrackBar1
        Me.BarEditItem1.Id = 26
        Me.BarEditItem1.Name = "BarEditItem1"
        '
        'RepositoryItemTrackBar1
        '
        Me.RepositoryItemTrackBar1.LabelAppearance.Options.UseTextOptions = True
        Me.RepositoryItemTrackBar1.LabelAppearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
        Me.RepositoryItemTrackBar1.Maximum = 5
        Me.RepositoryItemTrackBar1.Name = "RepositoryItemTrackBar1"
        '
        'BarEditItem2
        '
        Me.BarEditItem2.Caption = "BarEditItem2"
        Me.BarEditItem2.Edit = Me.RepositoryItemTrackBar2
        Me.BarEditItem2.Id = 27
        Me.BarEditItem2.Name = "BarEditItem2"
        '
        'RepositoryItemTrackBar2
        '
        Me.RepositoryItemTrackBar2.LabelAppearance.Options.UseTextOptions = True
        Me.RepositoryItemTrackBar2.LabelAppearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
        Me.RepositoryItemTrackBar2.Maximum = 5
        Me.RepositoryItemTrackBar2.Name = "RepositoryItemTrackBar2"
        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup5, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup5})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Suche"
        '
@ -249,12 +304,20 @@ Partial Class frmSearchFlow
        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
        Me.RibbonPageGroup5.Text = "Begriffsverknüpfung"
        '
        'RibbonPage3
        '
        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
        Me.RibbonPage3.Name = "RibbonPage3"
        Me.RibbonPage3.Text = "Layout"
        '
        'RibbonPageGroup3
        '
-        Me.RibbonPageGroup3.Enabled = False
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.chkGridVertical)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnSaveSearch)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.chkGridHorizontal)
        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarEditItem1)
        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarEditItem2)
        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "Eigene Suchen"
+        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
        '
        'RepositoryItemMarqueeProgressBar1
        '
@ -336,7 +399,7 @@ Partial Class frmSearchFlow
        Me.GridSearches.MainView = Me.ViewSearches
        Me.GridSearches.MenuManager = Me.RibbonControl1
        Me.GridSearches.Name = "GridSearches"
-        Me.GridSearches.Size = New System.Drawing.Size(858, 184)
+        Me.GridSearches.Size = New System.Drawing.Size(858, 183)
        Me.GridSearches.TabIndex = 1
        Me.GridSearches.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewSearches})
        '
@ -376,16 +439,16 @@ Partial Class frmSearchFlow
        TableRowDefinition1.Length.Value = 43.0R
        ItemTemplate1.Rows.Add(TableRowDefinition1)
        Me.ViewSearches.Templates.Add(ItemTemplate1)
-        TableColumnDefinition3.Length.Value = 30.0R
+        TableColumnDefinition3.Length.Value = 35.0R
        TableColumnDefinition3.PaddingRight = 5
-        TableColumnDefinition4.Length.Value = 129.0R
+        TableColumnDefinition4.Length.Value = 111.0R
        Me.ViewSearches.TileColumns.Add(TableColumnDefinition3)
        Me.ViewSearches.TileColumns.Add(TableColumnDefinition4)
        TableRowDefinition2.Length.Value = 17.0R
        TableRowDefinition3.Length.Value = 45.0R
        Me.ViewSearches.TileRows.Add(TableRowDefinition2)
        Me.ViewSearches.TileRows.Add(TableRowDefinition3)
-        TileViewItemElement3.Appearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        TileViewItemElement3.Appearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold)
        TileViewItemElement3.Appearance.Normal.Options.UseFont = True
        TileViewItemElement3.Column = Me.colName
        TileViewItemElement3.ColumnIndex = 1
@ -421,7 +484,7 @@ Partial Class frmSearchFlow
        'DateEditFrom
        '
        Me.DateEditFrom.EditValue = Nothing
-        Me.DateEditFrom.Location = New System.Drawing.Point(95, 327)
+        Me.DateEditFrom.Location = New System.Drawing.Point(95, 326)
        Me.DateEditFrom.MenuManager = Me.RibbonControl1
        Me.DateEditFrom.Name = "DateEditFrom"
        Me.DateEditFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@ -433,7 +496,7 @@ Partial Class frmSearchFlow
        'DateEditTo
        '
        Me.DateEditTo.EditValue = Nothing
-        Me.DateEditTo.Location = New System.Drawing.Point(95, 379)
+        Me.DateEditTo.Location = New System.Drawing.Point(95, 378)
        Me.DateEditTo.MenuManager = Me.RibbonControl1
        Me.DateEditTo.Name = "DateEditTo"
        Me.DateEditTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@ -444,7 +507,7 @@ Partial Class frmSearchFlow
        '
        'CheckEdit1
        '
-        Me.CheckEdit1.Location = New System.Drawing.Point(4, 354)
+        Me.CheckEdit1.Location = New System.Drawing.Point(4, 353)
        Me.CheckEdit1.MenuManager = Me.RibbonControl1
        Me.CheckEdit1.Name = "CheckEdit1"
        Me.CheckEdit1.Properties.OffText = "Datum bis deaktiviert"
@ -455,7 +518,7 @@ Partial Class frmSearchFlow
        '
        'ComboBoxDateAttributes
        '
-        Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(95, 409)
+        Me.ComboBoxDateAttributes.Location = New System.Drawing.Point(95, 408)
        Me.ComboBoxDateAttributes.MenuManager = Me.RibbonControl1
        Me.ComboBoxDateAttributes.Name = "ComboBoxDateAttributes"
        Me.ComboBoxDateAttributes.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
@ -481,10 +544,10 @@ Partial Class frmSearchFlow
        Me.LayoutControlGroupDate2.AppearanceGroup.Options.UseBorderColor = True
        Me.LayoutControlGroupDate2.BestFitWeight = 0
        Me.LayoutControlGroupDate2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem4, Me.EmptySpaceItem1, Me.LayoutControlItem6, Me.LayoutControlItem8})
-        Me.LayoutControlGroupDate2.Location = New System.Drawing.Point(0, 298)
+        Me.LayoutControlGroupDate2.Location = New System.Drawing.Point(0, 297)
        Me.LayoutControlGroupDate2.Name = "LayoutControlGroupDate2"
        Me.LayoutControlGroupDate2.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0)
-        Me.LayoutControlGroupDate2.Size = New System.Drawing.Size(886, 148)
+        Me.LayoutControlGroupDate2.Size = New System.Drawing.Size(886, 149)
        Me.LayoutControlGroupDate2.Text = "Eigenes Datum"
        Me.LayoutControlGroupDate2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never
        '
@ -514,7 +577,7 @@ Partial Class frmSearchFlow
        Me.EmptySpaceItem1.AllowHotTrack = False
        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 112)
        Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
-        Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 10)
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(882, 11)
        Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
        '
        'LayoutControlItem6
@ -543,7 +606,7 @@ Partial Class frmSearchFlow
        Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3})
        Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 64)
        Me.LayoutControlGroup3.Name = "LayoutControlGroup3"
-        Me.LayoutControlGroup3.Size = New System.Drawing.Size(886, 234)
+        Me.LayoutControlGroup3.Size = New System.Drawing.Size(886, 233)
        Me.LayoutControlGroup3.Text = "Meine Suchen"
        '
        'LayoutControlItem3
@ -551,7 +614,7 @@ Partial Class frmSearchFlow
        Me.LayoutControlItem3.Control = Me.GridSearches
        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem3.Name = "LayoutControlItem3"
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(862, 188)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(862, 187)
        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem3.TextVisible = False
        '
@ -588,6 +651,8 @@ Partial Class frmSearchFlow
        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "Search Flow"
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemTrackBar1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemTrackBar2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.RepositoryItemMarqueeProgressBar1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.PanelControl1.ResumeLayout(False)
@ -662,5 +727,12 @@ Partial Class frmSearchFlow
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents colGroupText As DevExpress.XtraGrid.Columns.TileViewColumn
    Friend WithEvents btnSaveSearch As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents chkGridVertical As DevExpress.XtraBars.BarCheckItem
    Friend WithEvents chkGridHorizontal As DevExpress.XtraBars.BarCheckItem
    Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem
    Friend WithEvents RepositoryItemTrackBar1 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar
    Friend WithEvents BarEditItem2 As DevExpress.XtraBars.BarEditItem
    Friend WithEvents RepositoryItemTrackBar2 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar
 End Class
--- a/GUIs.ZooFlow/Search/frmSearchFlow.vb
+++ b/GUIs.ZooFlow/Search/frmSearchFlow.vb
@ -7,6 +7,7 @@ Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Tile
 Imports DevExpress.XtraSplashScreen
 Imports DigitalData.GUIs.ZooFlow.ClassConstants
 Imports DigitalData.GUIs.ZooFlow.SavedSearch
 Imports DigitalData.GUIs.ZooFlow.Search
 Imports DigitalData.GUIs.ZooFlow.Search.SearchToken
 Imports DigitalData.Modules.Language
@ -21,24 +22,23 @@ Public Class frmSearchFlow
    Private TokenTable As DataTable = Nothing
    Private FormLoading As Boolean = True
-    Private TokenListDefault As New Dictionary(Of String, Object)
+    Private ReadOnly TokenListDefault As New Dictionary(Of String, Object)
-    Private TokenListOperands As New Dictionary(Of String, Object)
+    Private ReadOnly TokenListOperands As New Dictionary(Of String, Object)
-    Private TokenListAttrValues As New Dictionary(Of String, Object)
+    Private ReadOnly TokenListAttrValues As New Dictionary(Of String, Object)
    Private Sub frmFlowSearch2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        SearchLoader = New SearchLoader(My.LogConfig, My.UIConfigManager, SvgImageCollection1)
+        SearchLoader = New SearchLoader(My.LogConfig, My.SystemConfigManager, SvgImageCollection1)
        SearchRunner = New SearchRunner(My.LogConfig, My.Application.GetEnvironment, "FlowSearch") With {
            .BaseSearchSQL = SQL_FLOW_SEARCH_BASE
        }
        AddHandler SearchRunner.NeedsNewSavedSearch, AddressOf SearchRunner_NewSavedSearch
        TokenTable = GetTokenTable()
        ComboBoxDateAttributes.Properties.Items.AddRange(LoadDateAttributes())
        ComboBoxDateAttributes.SelectedIndex = 0
-        Dim oSearchBindingList As New BindingSource() With {
+        GridSearches.DataSource = SearchLoader.LoadSearches()
            .DataSource = SearchLoader.LoadSearches()
        }
        GridSearches.DataSource = oSearchBindingList
        Dim oTokens = GetTokensFromTable(Of AttributeValueToken)(TokenTable)
        AddTokens(txtSearchInput, oTokens)
@ -46,6 +46,16 @@ Public Class frmSearchFlow
        ViewSearches.FocusedRowHandle = GridControl.InvalidRowHandle
        FormLoading = False
    End Sub
    Private Sub SearchRunner_NewSavedSearch(sender As Object, e As EventArgs)
        Dim oForm As New frmEditSearch With {.IsNew = True}
        If oForm.ShowDialog() = DialogResult.OK Then
            SearchLoader.CreateCustomSearch(oForm.Title, oForm.Description, New List(Of Token), oForm.ImageString)
            GridSearches.DataSource = SearchLoader.LoadSearches()
        End If
    End Sub
    Public Function GetTokenTable() As DataTable
@ -55,54 +65,62 @@ Public Class frmSearchFlow
    End Function
    Public Function GetTokensFromTable(Of T As {New, Token})(pTable As DataTable) As List(Of T)
-        Dim oTokens As New List(Of T)
+        Try
-        Dim oTermValueBlackList As New List(Of String) From {"", " "}
+            Dim oTokens As New List(Of T)
            Dim oTermValueBlackList As New List(Of String) From {"", " "}
-        For Each oRow As DataRow In pTable.Rows
+            For Each oRow As DataRow In pTable.Rows
-            Dim oTermValue = oRow.Item("TERM")
+                Dim oTermValue = oRow.Item("TERM")
-            Dim oTermId = oRow.ItemEx("TERM_ID", 0)
+                Dim oTermId = oRow.ItemEx("TERM_ID", 0)
-            Dim oAttributeTitle = oRow.Item("ATTR_TITLE")
+                Dim oAttributeTitle = oRow.Item("ATTR_TITLE")
-            Dim oAttributeId = oRow.ItemEx("ATTR_ID", 0)
+                Dim oAttributeId = oRow.ItemEx("ATTR_ID", 0)
-            If oTermValueBlackList.Contains(oTermValue) Then
+                If oTermValueBlackList.Contains(oTermValue) Then
-                Continue For
+                    Continue For
-            End If
+                End If
-            oTokens.Add(New T() With {
+                oTokens.Add(New T() With {
-                .AttributeId = oAttributeId,
+                    .AttributeId = oAttributeId,
-                .AttributeTitle = oAttributeTitle,
+                    .AttributeTitle = oAttributeTitle,
-                .TermId = oTermId,
+                    .TermId = oTermId,
-                .TermValue = oTermValue
+                    .TermValue = oTermValue
-            })
+                })
-        Next
+            Next
-        Return oTokens.
+            Return oTokens.
-            OrderBy(Function(token) token.TermValue).
+                OrderBy(Function(token) token.TermValue).
-            Distinct().
+                Distinct().
-            ToList()
+                ToList()
        Catch ex As Exception
            Logger.error(ex)
            Return New List(Of T)
        End Try
    End Function
    Private Function LoadDateAttributes() As List(Of String)
-        Dim oAttributes = My.Tables.DTIDB_ATTRIBUTE.
+        Try
-            AsEnumerable().
+            Dim oAttributes = My.Tables.DTIDB_ATTRIBUTE.
-            Where(Function(row) CBool(row.Item("SYS_ATTRIBUTE")) = False).
+           AsEnumerable().
-            Where(Function(row) row.Item("TYP_ID") = 5 Or row.Item("TYP_ID") = 6).
+           Where(Function(row) CBool(row.Item("SYS_ATTRIBUTE")) = False).
-            Select(Function(row) row.Item("ATTR_TITLE")).
+           Where(Function(row) row.Item("TYP_ID") = 5 Or row.Item("TYP_ID") = 6).
-            Cast(Of String).
+           Select(Function(row) row.Item("ATTR_TITLE")).
-            ToList()
+           Cast(Of String).
           ToList()
-        If My.Application.User.Language = "de-DE" Then
+            If My.Application.User.Language = "de-DE" Then
-            oAttributes.Add(IDB_ADDED_WHEN_String_German)
+                oAttributes.Add(IDB_ADDED_WHEN_String_German)
-        Else
+            Else
-            oAttributes.Add(IDB_ADDED_WHEN_String_Englisch)
+                oAttributes.Add(IDB_ADDED_WHEN_String_Englisch)
-        End If
+            End If
-        Return oAttributes
+            Return oAttributes
        Catch ex As Exception
            Logger.error(ex)
            Return New List(Of String)
        End Try
    End Function
    Private Function GetTokens() As IEnumerable(Of Token)
        Dim oTokens = txtSearchInput.GetTokenList()
        Return oTokens.Select(Of Token)(Function(token) token.Value).ToList()
@ -115,7 +133,14 @@ Public Class frmSearchFlow
    End Sub
    Private Async Sub TileView1_ItemClick(sender As Object, e As TileViewItemClickEventArgs) Handles ViewSearches.ItemClick
-        Await RunSearch2(GetTokens())
+        Dim oSearch = ViewSearches.GetRow(ViewSearches.FocusedRowHandle)
        If TypeOf oSearch Is CustomSearch Then
            Dim oCustomSearch As CustomSearch = oSearch
            Await RunSearch2(oCustomSearch.Tokens)
        Else
            Await RunSearch2(GetTokens())
        End If
    End Sub
    Private Async Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
@ -129,8 +154,8 @@ Public Class frmSearchFlow
        Try
            ' If the user clicked on a Search Tile, it will set the date constraint for this search
            Dim oSearch = ViewSearches.GetRow(ViewSearches.FocusedRowHandle)
-            If oSearch IsNot Nothing AndAlso TypeOf oSearch Is SearchLoader.PredefinedDateSearch Then
+            If oSearch IsNot Nothing AndAlso TypeOf oSearch Is SavedSearch.PredefinedDateSearch Then
-                Dim oDateSearch As SearchLoader.PredefinedDateSearch = oSearch
+                Dim oDateSearch As SavedSearch.PredefinedDateSearch = oSearch
                oSearchTitle = oDateSearch.DisplayName
                SearchRunner.SetDateConstraint(oDateSearch.DateConstraint)
            Else
@ -185,8 +210,6 @@ Public Class frmSearchFlow
        End Try
    End Function
    Private Function StartUpdateUI() As IOverlaySplashScreenHandle
        SetStatusBarColor(Color.FromArgb(255, 240, 240, 240), Color.Black)
        Dim oHandle = SplashScreenManager.ShowOverlayForm(LayoutControl1)
@ -269,10 +292,6 @@ Public Class frmSearchFlow
        End If
    End Sub
    Private Sub BarToggleSwitchItem2_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
    End Sub
    Private Sub BarCheckItem3_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkDatefilter2.CheckedChanged
        If chkDatefilter2.Checked Then
            LayoutControlGroupDate2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always
@ -325,19 +344,19 @@ Public Class frmSearchFlow
        FormLoading = False
    End Sub
-    Private Sub TileView1_CustomItemTemplate(sender As Object, e As TileViewCustomItemTemplateEventArgs) Handles ViewSearches.CustomItemTemplate
+    Private Sub chkGridVertical_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkGridVertical.CheckedChanged
-        Dim oSearch = ViewSearches.GetRow(e.RowHandle)
+        ViewSearches.OptionsTiles.Orientation = Orientation.Vertical
        'If TypeOf oSearch Is PredefinedDateSearch Then
        '    e.Template = e.Templates.Item("DefaultSmall")
        'Else
        '    e.Template = e.Templates.Item("Default")
        'End If
        e.Template = e.Templates.Item("Default")
    End Sub
-    Private Sub btnSaveSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSaveSearch.ItemClick
+    Private Sub chkGridHorizontal_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkGridHorizontal.CheckedChanged
-        SearchLoader.CreateCustomSearch("TestSearch", "Some Stuff", GetTokens(), "invoice")
+        ViewSearches.OptionsTiles.Orientation = Orientation.Horizontal
-        GridSearches.DataSource = SearchLoader.LoadSearches()
+    End Sub
    Private Sub BarEditItem1_EditValueChanged(sender As Object, e As EventArgs) Handles BarEditItem1.EditValueChanged
        ViewSearches.OptionsTiles.ColumnCount = BarEditItem1.EditValue
    End Sub
    Private Sub BarEditItem2_EditValueChanged(sender As Object, e As EventArgs) Handles BarEditItem2.EditValueChanged
        ViewSearches.OptionsTiles.RowCount = BarEditItem2.EditValue
    End Sub
 End Class
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@ -347,6 +347,13 @@
      <DependentUpon>MyDataset.xsd</DependentUpon>
    </Compile>
    <Compile Include="Queries\ClassTables.vb" />
    <Compile Include="Search\frmEditSearch.Designer.vb">
      <DependentUpon>frmEditSearch.vb</DependentUpon>
    </Compile>
    <Compile Include="Search\frmEditSearch.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Search\SavedSearch.vb" />
    <Compile Include="Search\SearchLoader.vb" />
    <Compile Include="Search\TokenEditEx.vb">
      <SubType>Component</SubType>
@ -535,6 +542,9 @@
    <EmbeddedResource Include="Modules\Globix\frmFileflow_Duplicate.resx">
      <DependentUpon>frmFileflow_Duplicate.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Search\frmEditSearch.resx">
      <DependentUpon>frmEditSearch.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Search\Old\frmFlowSearch.resx">
      <DependentUpon>frmFlowSearch.vb</DependentUpon>
    </EmbeddedResource>
@ -1129,6 +1139,8 @@
    <None Include="Resources\enablesearch.svg" />
    <None Include="Resources\undo.svg" />
    <None Include="Resources\bo_security_permission_action.svg" />
    <None Include="Resources\alignverticalcenter.svg" />
    <None Include="Resources\alignhorizontalcenter.svg" />
    <Content Include="Zooflow.ico" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />