diff --git a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll
index 22471d2..cc9cf6b 100644
Binary files a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll and b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll differ
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml
index a69f0f5..344fac5 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<F4SD-Global-Configuration  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-Global-Configuration.xsd">
-
-  <ShouldSkipSlimView Policy="Default" Value="true" />
-  <SmallViewAlignment Policy="Default" Value="Right" />
-  <FavouriteBarAlignment Policy="Default" Value="Right" />
-
-  <InformationClassSearchPriority Policy="Hidden">
-    <InformationClass Type="User" />
-    <InformationClass Type="Computer" />
-    <InformationClass Type="VirtualSession" />
-    <InformationClass Type="Ticket" />
-  </InformationClassSearchPriority>
-
-  <TicketConfiguration>
-    <DisableAutomaticTimeTracking Policy="Mandatory" Value="true" />
+<?xml version="1.0" encoding="utf-8"?>
+<F4SD-Global-Configuration  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-Global-Configuration.xsd">
+
+  <ShouldSkipSlimView Policy="Default" Value="true" />
+  <SmallViewAlignment Policy="Default" Value="Right" />
+  <FavouriteBarAlignment Policy="Default" Value="Right" />
+
+  <InformationClassSearchPriority Policy="Hidden">
+    <InformationClass Type="User" />
+    <InformationClass Type="Computer" />
+    <InformationClass Type="VirtualSession" />
+    <InformationClass Type="Ticket" />
+  </InformationClassSearchPriority>
+
+  <TicketConfiguration>
+    <DisableAutomaticTimeTracking Policy="Mandatory" Value="true" />
     <CompletitionPolicy Policy="Mandatory" Value="IfRequired" />
     <NotesMandatory Policy="Mandatory" Value="true" />
     <ShowOverview Policy="Mandatory" Value="false" />
-    <OverviewOpenTicketsExternally Policy="Mandatory" Value="false" />
-    <OverviewOpenIncidentsExternally Policy="Mandatory" Value="false" />
+    <OpenTicketsExternally Policy="Mandatory" Value="false" />
+    <OpenIncidentsExternally Policy="Mandatory" Value="false" />
     <OverviewPollingPersonal Policy="Mandatory" Value="10" />
     <OverviewPollingRole Policy="Mandatory" Value="5" />
   </TicketConfiguration>
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xsd b/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xsd
index 527a9ba..654d851 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xsd
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-Global-Configuration.xsd
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
-  <xs:simpleType name="InformationClassEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="User"/>
-      <xs:enumeration value="Computer"/>
-      <xs:enumeration value="VirtualSession"/>
-      <xs:enumeration value="Ticket"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="PolicyEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="Default"/>
-      <xs:enumeration value="Mandatory"/>
-      <xs:enumeration value="Hidden"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="TicketCompletitionPolicyEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="IfRequired"/>
-      <xs:enumeration value="false"/>
-      <xs:enumeration value="true"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="HorizontalAlignmentEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="Default"/>
-      <xs:enumeration value="Right"/>
-      <xs:enumeration value="Center"/>
-      <xs:enumeration value="Left"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="StringNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-    <xs:attribute name="Value" type="xs:string" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="IntegerNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-    <xs:attribute name="Value" type="xs:integer" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="BoolNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-    <xs:attribute name="Value" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="PolicyNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-  </xs:complexType>
-
-  <xs:element name="F4SD-Global-Configuration">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="ShouldSkipSlimView" minOccurs="0" maxOccurs="1">
-          <xs:complexType><xs:complexContent><xs:extension base="BoolNode"></xs:extension></xs:complexContent></xs:complexType>
-        </xs:element>
-        <xs:element name="SmallViewAlignment" minOccurs="0" maxOccurs="1">
-          <xs:complexType> <xs:complexContent><xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
-          </xs:extension></xs:complexContent></xs:complexType>
-        </xs:element>
-        <xs:element name="FavouriteBarAlignment" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element ref="InformationClassSearchPriority" minOccurs="0" maxOccurs="1"/>
-        <xs:element ref="TicketConfiguration" minOccurs="0" maxOccurs="1"/>
-      </xs:all>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="InformationClassSearchPriority">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="PolicyNode">
-          <xs:sequence>
-            <xs:element ref="InformationClass" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="InformationClass">
-    <xs:complexType>
-        <xs:attribute name="Type" type="InformationClassEnum" use="required"/>
-    </xs:complexType>
-    </xs:element>
-
-  <xs:element name="TicketConfiguration">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="NotesMandatory" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="BoolNode"></xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="DisableAutomaticTimeTracking" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="BoolNode"></xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="CompletitionPolicy" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="TicketCompletitionPolicyEnum" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+  <xs:simpleType name="InformationClassEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="User"/>
+      <xs:enumeration value="Computer"/>
+      <xs:enumeration value="VirtualSession"/>
+      <xs:enumeration value="Ticket"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="PolicyEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="Default"/>
+      <xs:enumeration value="Mandatory"/>
+      <xs:enumeration value="Hidden"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TicketCompletitionPolicyEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="IfRequired"/>
+      <xs:enumeration value="false"/>
+      <xs:enumeration value="true"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="HorizontalAlignmentEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="Default"/>
+      <xs:enumeration value="Right"/>
+      <xs:enumeration value="Center"/>
+      <xs:enumeration value="Left"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="StringNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+    <xs:attribute name="Value" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="IntegerNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+    <xs:attribute name="Value" type="xs:integer" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="BoolNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+    <xs:attribute name="Value" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="PolicyNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="F4SD-Global-Configuration">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ShouldSkipSlimView" minOccurs="0" maxOccurs="1">
+          <xs:complexType><xs:complexContent><xs:extension base="BoolNode"></xs:extension></xs:complexContent></xs:complexType>
+        </xs:element>
+        <xs:element name="SmallViewAlignment" minOccurs="0" maxOccurs="1">
+          <xs:complexType> <xs:complexContent><xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
+          </xs:extension></xs:complexContent></xs:complexType>
+        </xs:element>
+        <xs:element name="FavouriteBarAlignment" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element ref="InformationClassSearchPriority" minOccurs="0" maxOccurs="1"/>
+        <xs:element ref="TicketConfiguration" minOccurs="0" maxOccurs="1"/>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="InformationClassSearchPriority">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="PolicyNode">
+          <xs:sequence>
+            <xs:element ref="InformationClass" minOccurs="0" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="InformationClass">
+    <xs:complexType>
+        <xs:attribute name="Type" type="InformationClassEnum" use="required"/>
+    </xs:complexType>
+    </xs:element>
+
+  <xs:element name="TicketConfiguration">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="NotesMandatory" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="BoolNode"></xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="DisableAutomaticTimeTracking" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="BoolNode"></xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="CompletitionPolicy" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="TicketCompletitionPolicyEnum" use="required"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="ShowOverview" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:complexContent>
@@ -131,14 +131,14 @@
             </xs:complexContent>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OverviewOpenTicketsExternally" minOccurs="0" maxOccurs="1">
+        <xs:element name="OpenTicketsExternally" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:complexContent>
               <xs:extension base="BoolNode"></xs:extension>
             </xs:complexContent>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OverviewOpenIncidentsExternally" minOccurs="0" maxOccurs="1">
+        <xs:element name="OpenIncidentsExternally" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:complexContent>
               <xs:extension base="BoolNode"></xs:extension>
@@ -150,21 +150,21 @@
             <xs:complexContent>
               <xs:extension base="PolicyNode">
                 <xs:attribute name="Value" type="xs:positiveInteger" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="OverviewPollingRole" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="xs:positiveInteger" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-    </xs:complexType>
-  </xs:element>
-  
-</xs:schema>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="OverviewPollingRole" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="xs:positiveInteger" use="required"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+  
+</xs:schema>
diff --git a/F4SD-Cockpit-ServerCore/DataHistoryConfigGolabalParameters.cs b/F4SD-Cockpit-ServerCore/DataHistoryConfigGolabalParameters.cs
index 2bfd02f..a7733ea 100644
--- a/F4SD-Cockpit-ServerCore/DataHistoryConfigGolabalParameters.cs
+++ b/F4SD-Cockpit-ServerCore/DataHistoryConfigGolabalParameters.cs
@@ -295,13 +295,13 @@ namespace C4IT.DataHistoryProvider
                      );
                 RetVal |= DoXmlInsertElement(XmlRoot
                      , "TicketConfiguration"
-                     , "OverviewOpenTicketsExternally"
-                     , "<OverviewOpenTicketsExternally Policy=\"Hidden\" Value=\"false\" />"
+                     , "OpenTicketsExternally"
+                     , "<OpenTicketsExternally Policy=\"Hidden\" Value=\"false\" />"
                      );
                 RetVal |= DoXmlInsertElement(XmlRoot
                      , "TicketConfiguration"
-                     , "OverviewOpenIncidentsExternally"
-                     , "<OverviewOpenIncidentsExternally Policy=\"Hidden\" Value=\"false\" />"
+                     , "OpenIncidentsExternally"
+                     , "<OpenIncidentsExternally Policy=\"Hidden\" Value=\"false\" />"
                      );
                 RetVal |= DoXmlInsertElement(XmlRoot
                      , "TicketConfiguration"
diff --git a/F4SDwebService/Config/F4SD-Global-Configuration.xml b/F4SDwebService/Config/F4SD-Global-Configuration.xml
index a69f0f5..344fac5 100644
--- a/F4SDwebService/Config/F4SD-Global-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-Global-Configuration.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<F4SD-Global-Configuration  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-Global-Configuration.xsd">
-
-  <ShouldSkipSlimView Policy="Default" Value="true" />
-  <SmallViewAlignment Policy="Default" Value="Right" />
-  <FavouriteBarAlignment Policy="Default" Value="Right" />
-
-  <InformationClassSearchPriority Policy="Hidden">
-    <InformationClass Type="User" />
-    <InformationClass Type="Computer" />
-    <InformationClass Type="VirtualSession" />
-    <InformationClass Type="Ticket" />
-  </InformationClassSearchPriority>
-
-  <TicketConfiguration>
-    <DisableAutomaticTimeTracking Policy="Mandatory" Value="true" />
+<?xml version="1.0" encoding="utf-8"?>
+<F4SD-Global-Configuration  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-Global-Configuration.xsd">
+
+  <ShouldSkipSlimView Policy="Default" Value="true" />
+  <SmallViewAlignment Policy="Default" Value="Right" />
+  <FavouriteBarAlignment Policy="Default" Value="Right" />
+
+  <InformationClassSearchPriority Policy="Hidden">
+    <InformationClass Type="User" />
+    <InformationClass Type="Computer" />
+    <InformationClass Type="VirtualSession" />
+    <InformationClass Type="Ticket" />
+  </InformationClassSearchPriority>
+
+  <TicketConfiguration>
+    <DisableAutomaticTimeTracking Policy="Mandatory" Value="true" />
     <CompletitionPolicy Policy="Mandatory" Value="IfRequired" />
     <NotesMandatory Policy="Mandatory" Value="true" />
     <ShowOverview Policy="Mandatory" Value="false" />
-    <OverviewOpenTicketsExternally Policy="Mandatory" Value="false" />
-    <OverviewOpenIncidentsExternally Policy="Mandatory" Value="false" />
+    <OpenTicketsExternally Policy="Mandatory" Value="false" />
+    <OpenIncidentsExternally Policy="Mandatory" Value="false" />
     <OverviewPollingPersonal Policy="Mandatory" Value="10" />
     <OverviewPollingRole Policy="Mandatory" Value="5" />
   </TicketConfiguration>
diff --git a/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml
index a69f0f5..344fac5 100644
--- a/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<F4SD-Global-Configuration  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-Global-Configuration.xsd">
-
-  <ShouldSkipSlimView Policy="Default" Value="true" />
-  <SmallViewAlignment Policy="Default" Value="Right" />
-  <FavouriteBarAlignment Policy="Default" Value="Right" />
-
-  <InformationClassSearchPriority Policy="Hidden">
-    <InformationClass Type="User" />
-    <InformationClass Type="Computer" />
-    <InformationClass Type="VirtualSession" />
-    <InformationClass Type="Ticket" />
-  </InformationClassSearchPriority>
-
-  <TicketConfiguration>
-    <DisableAutomaticTimeTracking Policy="Mandatory" Value="true" />
+<?xml version="1.0" encoding="utf-8"?>
+<F4SD-Global-Configuration  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-Global-Configuration.xsd">
+
+  <ShouldSkipSlimView Policy="Default" Value="true" />
+  <SmallViewAlignment Policy="Default" Value="Right" />
+  <FavouriteBarAlignment Policy="Default" Value="Right" />
+
+  <InformationClassSearchPriority Policy="Hidden">
+    <InformationClass Type="User" />
+    <InformationClass Type="Computer" />
+    <InformationClass Type="VirtualSession" />
+    <InformationClass Type="Ticket" />
+  </InformationClassSearchPriority>
+
+  <TicketConfiguration>
+    <DisableAutomaticTimeTracking Policy="Mandatory" Value="true" />
     <CompletitionPolicy Policy="Mandatory" Value="IfRequired" />
     <NotesMandatory Policy="Mandatory" Value="true" />
     <ShowOverview Policy="Mandatory" Value="false" />
-    <OverviewOpenTicketsExternally Policy="Mandatory" Value="false" />
-    <OverviewOpenIncidentsExternally Policy="Mandatory" Value="false" />
+    <OpenTicketsExternally Policy="Mandatory" Value="false" />
+    <OpenIncidentsExternally Policy="Mandatory" Value="false" />
     <OverviewPollingPersonal Policy="Mandatory" Value="10" />
     <OverviewPollingRole Policy="Mandatory" Value="5" />
   </TicketConfiguration>
diff --git a/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xsd b/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xsd
index 527a9ba..654d851 100644
--- a/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xsd
+++ b/F4SDwebService/Publish/Config/F4SD-Global-Configuration.xsd
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
-  <xs:simpleType name="InformationClassEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="User"/>
-      <xs:enumeration value="Computer"/>
-      <xs:enumeration value="VirtualSession"/>
-      <xs:enumeration value="Ticket"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="PolicyEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="Default"/>
-      <xs:enumeration value="Mandatory"/>
-      <xs:enumeration value="Hidden"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="TicketCompletitionPolicyEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="IfRequired"/>
-      <xs:enumeration value="false"/>
-      <xs:enumeration value="true"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="HorizontalAlignmentEnum">
-    <xs:restriction base="xs:NCName">
-      <xs:enumeration value="Default"/>
-      <xs:enumeration value="Right"/>
-      <xs:enumeration value="Center"/>
-      <xs:enumeration value="Left"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="StringNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-    <xs:attribute name="Value" type="xs:string" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="IntegerNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-    <xs:attribute name="Value" type="xs:integer" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="BoolNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-    <xs:attribute name="Value" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="PolicyNode">
-    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
-  </xs:complexType>
-
-  <xs:element name="F4SD-Global-Configuration">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="ShouldSkipSlimView" minOccurs="0" maxOccurs="1">
-          <xs:complexType><xs:complexContent><xs:extension base="BoolNode"></xs:extension></xs:complexContent></xs:complexType>
-        </xs:element>
-        <xs:element name="SmallViewAlignment" minOccurs="0" maxOccurs="1">
-          <xs:complexType> <xs:complexContent><xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
-          </xs:extension></xs:complexContent></xs:complexType>
-        </xs:element>
-        <xs:element name="FavouriteBarAlignment" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element ref="InformationClassSearchPriority" minOccurs="0" maxOccurs="1"/>
-        <xs:element ref="TicketConfiguration" minOccurs="0" maxOccurs="1"/>
-      </xs:all>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="InformationClassSearchPriority">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="PolicyNode">
-          <xs:sequence>
-            <xs:element ref="InformationClass" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="InformationClass">
-    <xs:complexType>
-        <xs:attribute name="Type" type="InformationClassEnum" use="required"/>
-    </xs:complexType>
-    </xs:element>
-
-  <xs:element name="TicketConfiguration">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="NotesMandatory" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="BoolNode"></xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="DisableAutomaticTimeTracking" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="BoolNode"></xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="CompletitionPolicy" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="TicketCompletitionPolicyEnum" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+  <xs:simpleType name="InformationClassEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="User"/>
+      <xs:enumeration value="Computer"/>
+      <xs:enumeration value="VirtualSession"/>
+      <xs:enumeration value="Ticket"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="PolicyEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="Default"/>
+      <xs:enumeration value="Mandatory"/>
+      <xs:enumeration value="Hidden"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TicketCompletitionPolicyEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="IfRequired"/>
+      <xs:enumeration value="false"/>
+      <xs:enumeration value="true"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="HorizontalAlignmentEnum">
+    <xs:restriction base="xs:NCName">
+      <xs:enumeration value="Default"/>
+      <xs:enumeration value="Right"/>
+      <xs:enumeration value="Center"/>
+      <xs:enumeration value="Left"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="StringNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+    <xs:attribute name="Value" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="IntegerNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+    <xs:attribute name="Value" type="xs:integer" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="BoolNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+    <xs:attribute name="Value" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="PolicyNode">
+    <xs:attribute name="Policy" type="PolicyEnum" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="F4SD-Global-Configuration">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ShouldSkipSlimView" minOccurs="0" maxOccurs="1">
+          <xs:complexType><xs:complexContent><xs:extension base="BoolNode"></xs:extension></xs:complexContent></xs:complexType>
+        </xs:element>
+        <xs:element name="SmallViewAlignment" minOccurs="0" maxOccurs="1">
+          <xs:complexType> <xs:complexContent><xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
+          </xs:extension></xs:complexContent></xs:complexType>
+        </xs:element>
+        <xs:element name="FavouriteBarAlignment" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="HorizontalAlignmentEnum" use="required"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element ref="InformationClassSearchPriority" minOccurs="0" maxOccurs="1"/>
+        <xs:element ref="TicketConfiguration" minOccurs="0" maxOccurs="1"/>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="InformationClassSearchPriority">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="PolicyNode">
+          <xs:sequence>
+            <xs:element ref="InformationClass" minOccurs="0" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="InformationClass">
+    <xs:complexType>
+        <xs:attribute name="Type" type="InformationClassEnum" use="required"/>
+    </xs:complexType>
+    </xs:element>
+
+  <xs:element name="TicketConfiguration">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="NotesMandatory" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="BoolNode"></xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="DisableAutomaticTimeTracking" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="BoolNode"></xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="CompletitionPolicy" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="TicketCompletitionPolicyEnum" use="required"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="ShowOverview" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:complexContent>
@@ -131,14 +131,14 @@
             </xs:complexContent>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OverviewOpenTicketsExternally" minOccurs="0" maxOccurs="1">
+        <xs:element name="OpenTicketsExternally" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:complexContent>
               <xs:extension base="BoolNode"></xs:extension>
             </xs:complexContent>
           </xs:complexType>
         </xs:element>
-        <xs:element name="OverviewOpenIncidentsExternally" minOccurs="0" maxOccurs="1">
+        <xs:element name="OpenIncidentsExternally" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:complexContent>
               <xs:extension base="BoolNode"></xs:extension>
@@ -150,21 +150,21 @@
             <xs:complexContent>
               <xs:extension base="PolicyNode">
                 <xs:attribute name="Value" type="xs:positiveInteger" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="OverviewPollingRole" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="PolicyNode">
-                <xs:attribute name="Value" type="xs:positiveInteger" use="required"/>
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-    </xs:complexType>
-  </xs:element>
-  
-</xs:schema>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="OverviewPollingRole" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="PolicyNode">
+                <xs:attribute name="Value" type="xs:positiveInteger" use="required"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+  
+</xs:schema>