diff --git a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll
index 00ed442..59150d0 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-CopyTemplate-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-CopyTemplate-Configuration.xml
index 99bf31c..3a8a51b 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-CopyTemplate-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-CopyTemplate-Configuration.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <F4SD-CopyTemplate-Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-CopyTemplate-Configuration.xsd">
-	<CopyTemplates Default="Ticket-Information-Computer">
-		<CopyTemplate Name="Ticket-Information-Computer">
-			<Name Lang="DE">Ticket-Information-Computer</Name>
+	<CopyTemplates Default="Ticket Information-Computer">
+		<CopyTemplate Name="Ticket Information-Computer">
+			<Name Lang="DE">Ticket Information-Computer</Name>
 			<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
 			<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
 			<Icon Name="misc_ticket" IconType="intern"/>
@@ -29,20 +29,21 @@
 			</CopyContent>
 		</CopyTemplate>
 		<CopyTemplate Name="Ticket Information-VM">
-			<Name Lang="DE">Ticket Information VM</Name>
+			<Name Lang="DE">Ticket Information-VM</Name>
 			<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
 			<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
 			<Icon Name="misc_ticket" IconType="intern"/>
 			<CopyContent Format="UNICODE">
 				%VirtualSessionName.Label% %VirtualSessionName.Value%
-				%VirtualSessionStatus.Label% %VirtualSessionStatus.Value%
+				%DNSName.Label% %DNSName.Value%
+				%DomainName.Label% %DomainName.Value%
 				%HostedMachine.Label% %HostedMachine.Value%
-				%DeviceName.Label% %DeviceName.Value%
 			</CopyContent>
 			<CopyContent Format="HTML">
 				&lt;table border=&quot;1&quot; cellpadding=&quot;5,1,5,1&quot;&gt;&lt;tbody&gt;
 				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td style=&quot;color: #0000ff;&quot;&gt;%VirtualSessionName.Value%&lt;/td&gt;&lt;/tr&gt;
-				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionStatus.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%VirtualSessionStatus.Value%&lt;/td&gt;&lt;/tr&gt;
+				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DNSName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DNSName.Value%&lt;/td&gt;&lt;/tr&gt;
+				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DomainName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DomainName.Value%&lt;/td&gt;&lt;/tr&gt;
 				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%HostedMachine.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%HostedMachine.Value%&lt;/td&gt;&lt;/tr&gt;
 				&lt;/tbody&gt;&lt;/table&gt;
 			</CopyContent>
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml
index db0156b..5e3bcc1 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-HealthCard-Configuration.xml
@@ -1612,25 +1612,8 @@
 					<State-Translation Name="Maintenance Mode active" ValueTable="citrix-session-machine" ValueColumn="IsInMaintenanceMode" Translation="citrix_IsMaintanceModeActive" DefaultState="Ok">
 						<Name Lang="DE">Wartungsmodus aktiv</Name>
 					</State-Translation>
-				</StateCategory>
-				<StateCategory Name="MachineUsageInformationWidget">
-					<State-Info Name="Host Utilization Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
-						<Name Lang="DE">Host Nutzung-Informationen</Name>
-					</State-Info>
-					<State-Level Name="CPU Utilization" ValueTable="citrix-session-machine" ValueColumn="Cpu" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">CPU Auslastung</Name>
-					</State-Level>
-					<State-Level Name="RAM/Memory Utilization" ValueTable="citrix-session-machine" ValueColumn="Memory" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">RAM/Arbeitsspeicher Auslastung</Name>
-					</State-Level>
-					<State-Level Name="Disk Utilization" ValueTable="citrix-session-machine" ValueColumn="Disk" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">Speicher Auslastung</Name>
-					</State-Level>
-					<State-Info Name="Current Session Count" ValueTable="citrix-session-machine" ValueColumn="CurrentSessionCount">
-						<Name Lang="DE">Aktuelle Sitzungsanzahl</Name>
-					</State-Info>
-				</StateCategory>
-				<StateCategory Name="MachineMetricWidget">
+				</StateCategory>				
+				<StateCategory Name="MachineUsageMetricWidget">
 					<State-Info Name="Host Utilization Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
 						<Name Lang="DE">Host Nutzung-Informationen</Name>
 					</State-Info>
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml
index 04e2d79..ea81c56 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-Infrastructure-Configuration.xml
@@ -76,7 +76,7 @@
     </AD-Scans>
   </Active-Directory>
 	<Azure-AD>
-    <Azure-Tenant Domain="c4it365.onmicrosoft.com" TenantID="8f773186-362b-4432-a3e9-d3ad4685f3f1" Credential="AzureAccess" ScanIntuneDevices = "true" WithMobileDevices="true">
+    <Azure-Tenant Domain="c4it365.onmicrosoft.com" TenantID="8f773186-362b-4432-a3e9-d3ad4685f3f1" Credential="AzureAccess" ScanIntuneDevices = "true" WithMobileDevices="false">
       <Azure-Filter-User UseBetaEnpoint="true" UseConsistencyLevelEventual="true">onPremisesExtensionAttributes/extensionAttribute8 in (&apos;C4IT&apos;, &apos;TS4U&apos;) and userType eq &apos;member&apos; and accountEnabled eq true</Azure-Filter-User>
     </Azure-Tenant>
 		<!--<Azure-Tenant Domain="sd0024.onmicrosoft.com" TenantID="07362148-410e-4636-a9cb-795fba1a5452" Credential="AzureAccess_Dieter"/>-->
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-QuickAction-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-QuickAction-Configuration.xml
index 6ca17fe..787f4fb 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-QuickAction-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-QuickAction-Configuration.xml
@@ -1088,7 +1088,7 @@
 			  </AdjustableParameter-DropDown>
 		  </AdjustableParameters>
 	  </QuickAction-Server>-->
-	  <QuickAction-Server Category="Intune" Action="UpdateComplianceState" Name="Update ComplianceState" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="bc98eabc-353f-4866-bab0-681aafe48d7b">
+	  <!--<QuickAction-Server Category="Intune" Action="UpdateComplianceState" Name="Update ComplianceState" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="37453657-94a7-4e72-b8f4-eaa4b085536d">
 		  <Name Lang="DE">Intune Komformitätsstatus erzwingen</Name>
 		  <Name Lang="EN">Enforce Intune compliance state</Name>
 		  <Description Lang="DE">Komformitätsstatus aktualisieren</Description>
@@ -1096,7 +1096,7 @@
 		  <Icon IconType="material" Name="ic_verified_user" />
 	  </QuickAction-Server>
 
-	  <QuickAction-Server Category="Intune" Action="GetManagedApps"  Name="Get Managed Apps" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="e798637e-a315-4d88-aec8-e6f22f9f70c7" >
+	  <QuickAction-Server Category="Intune" Action="GetManagedApps"  Name="Get Managed Apps" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="157212a0-8d4b-4431-b119-86d9df92ef16" >
 		  <Name Lang="DE">Verwaltete Anwendungen anzeigen</Name>
 		  <Name Lang="EN">Show managed applications</Name>
 
@@ -1119,14 +1119,14 @@
 		  </ColumnOutputFormattings>
 	  </QuickAction-Server>
 
-	  <QuickAction-Local-WebRequest InformationClass="MobileDevice" Name="Open Intune (web)" RunImmediate="true" CheckNamedParameter="IntuneDeviceId" Section="MobileDevice" Id="fc162f02-286d-48ce-a9ec-94118e62b735">
+	  <QuickAction-Local-WebRequest InformationClass="MobileDevice" Name="Open Intune (web)" RunImmediate="true" CheckNamedParameter="IntuneDeviceId" Section="MobileDevice" Id="ec5d651d-dfc1-4e57-8713-1d5b7d418818">
 		  <Name Lang="DE">Intune Webseite öffnen</Name>
 		  <AlternativeDescription Lang="EN">This Quick Action requires information about the "Device".</AlternativeDescription>
 		  <AlternativeDescription Lang="DE">Um diese Quick Action verwenden zu können werden Informationen über das "Gerät" benötigt.</AlternativeDescription>
 		  <Icon IconType="material" Name="ic_open_in_browser" />
 		  <QueryString>https://intune.microsoft.com/#view/Microsoft_Intune_Devices/DeviceSettingsMenuBlade/~/overview/mdmDeviceId/PARAM_DeviceId</QueryString>
 		  <QueryParameter Name="PARAM_DeviceId" ParameterName="IntuneDeviceId" />
-	  </QuickAction-Local-WebRequest>
+	  </QuickAction-Local-WebRequest>-->
 	  
 	  
 	  <QuickAction-Server Category="Citrix" Action="SessionLogoff" ParamaterType ="sessionId" CheckNamedParameter="VirtualSessionStatus" Name="Session Logoff" InformationClass="VirtuelSession" Section ="Citrix" Id="da4662c3-1988-413a-a834-aec81508a8d1">
diff --git a/F4SDwebService/Config/F4SD-CopyTemplate-Configuration.xml b/F4SDwebService/Config/F4SD-CopyTemplate-Configuration.xml
index 99bf31c..3a8a51b 100644
--- a/F4SDwebService/Config/F4SD-CopyTemplate-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-CopyTemplate-Configuration.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <F4SD-CopyTemplate-Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-CopyTemplate-Configuration.xsd">
-	<CopyTemplates Default="Ticket-Information-Computer">
-		<CopyTemplate Name="Ticket-Information-Computer">
-			<Name Lang="DE">Ticket-Information-Computer</Name>
+	<CopyTemplates Default="Ticket Information-Computer">
+		<CopyTemplate Name="Ticket Information-Computer">
+			<Name Lang="DE">Ticket Information-Computer</Name>
 			<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
 			<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
 			<Icon Name="misc_ticket" IconType="intern"/>
@@ -29,20 +29,21 @@
 			</CopyContent>
 		</CopyTemplate>
 		<CopyTemplate Name="Ticket Information-VM">
-			<Name Lang="DE">Ticket Information VM</Name>
+			<Name Lang="DE">Ticket Information-VM</Name>
 			<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
 			<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
 			<Icon Name="misc_ticket" IconType="intern"/>
 			<CopyContent Format="UNICODE">
 				%VirtualSessionName.Label% %VirtualSessionName.Value%
-				%VirtualSessionStatus.Label% %VirtualSessionStatus.Value%
+				%DNSName.Label% %DNSName.Value%
+				%DomainName.Label% %DomainName.Value%
 				%HostedMachine.Label% %HostedMachine.Value%
-				%DeviceName.Label% %DeviceName.Value%
 			</CopyContent>
 			<CopyContent Format="HTML">
 				&lt;table border=&quot;1&quot; cellpadding=&quot;5,1,5,1&quot;&gt;&lt;tbody&gt;
 				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td style=&quot;color: #0000ff;&quot;&gt;%VirtualSessionName.Value%&lt;/td&gt;&lt;/tr&gt;
-				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionStatus.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%VirtualSessionStatus.Value%&lt;/td&gt;&lt;/tr&gt;
+				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DNSName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DNSName.Value%&lt;/td&gt;&lt;/tr&gt;
+				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DomainName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DomainName.Value%&lt;/td&gt;&lt;/tr&gt;
 				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%HostedMachine.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%HostedMachine.Value%&lt;/td&gt;&lt;/tr&gt;
 				&lt;/tbody&gt;&lt;/table&gt;
 			</CopyContent>
diff --git a/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml b/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
index db0156b..5e3bcc1 100644
--- a/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-HealthCard-Configuration.xml
@@ -1612,25 +1612,8 @@
 					<State-Translation Name="Maintenance Mode active" ValueTable="citrix-session-machine" ValueColumn="IsInMaintenanceMode" Translation="citrix_IsMaintanceModeActive" DefaultState="Ok">
 						<Name Lang="DE">Wartungsmodus aktiv</Name>
 					</State-Translation>
-				</StateCategory>
-				<StateCategory Name="MachineUsageInformationWidget">
-					<State-Info Name="Host Utilization Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
-						<Name Lang="DE">Host Nutzung-Informationen</Name>
-					</State-Info>
-					<State-Level Name="CPU Utilization" ValueTable="citrix-session-machine" ValueColumn="Cpu" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">CPU Auslastung</Name>
-					</State-Level>
-					<State-Level Name="RAM/Memory Utilization" ValueTable="citrix-session-machine" ValueColumn="Memory" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">RAM/Arbeitsspeicher Auslastung</Name>
-					</State-Level>
-					<State-Level Name="Disk Utilization" ValueTable="citrix-session-machine" ValueColumn="Disk" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">Speicher Auslastung</Name>
-					</State-Level>
-					<State-Info Name="Current Session Count" ValueTable="citrix-session-machine" ValueColumn="CurrentSessionCount">
-						<Name Lang="DE">Aktuelle Sitzungsanzahl</Name>
-					</State-Info>
-				</StateCategory>
-				<StateCategory Name="MachineMetricWidget">
+				</StateCategory>				
+				<StateCategory Name="MachineUsageMetricWidget">
 					<State-Info Name="Host Utilization Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
 						<Name Lang="DE">Host Nutzung-Informationen</Name>
 					</State-Info>
diff --git a/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml b/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml
index 04e2d79..ea81c56 100644
--- a/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-Infrastructure-Configuration.xml
@@ -76,7 +76,7 @@
     </AD-Scans>
   </Active-Directory>
 	<Azure-AD>
-    <Azure-Tenant Domain="c4it365.onmicrosoft.com" TenantID="8f773186-362b-4432-a3e9-d3ad4685f3f1" Credential="AzureAccess" ScanIntuneDevices = "true" WithMobileDevices="true">
+    <Azure-Tenant Domain="c4it365.onmicrosoft.com" TenantID="8f773186-362b-4432-a3e9-d3ad4685f3f1" Credential="AzureAccess" ScanIntuneDevices = "true" WithMobileDevices="false">
       <Azure-Filter-User UseBetaEnpoint="true" UseConsistencyLevelEventual="true">onPremisesExtensionAttributes/extensionAttribute8 in (&apos;C4IT&apos;, &apos;TS4U&apos;) and userType eq &apos;member&apos; and accountEnabled eq true</Azure-Filter-User>
     </Azure-Tenant>
 		<!--<Azure-Tenant Domain="sd0024.onmicrosoft.com" TenantID="07362148-410e-4636-a9cb-795fba1a5452" Credential="AzureAccess_Dieter"/>-->
diff --git a/F4SDwebService/Config/F4SD-QuickAction-Configuration.xml b/F4SDwebService/Config/F4SD-QuickAction-Configuration.xml
index 6ca17fe..787f4fb 100644
--- a/F4SDwebService/Config/F4SD-QuickAction-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-QuickAction-Configuration.xml
@@ -1088,7 +1088,7 @@
 			  </AdjustableParameter-DropDown>
 		  </AdjustableParameters>
 	  </QuickAction-Server>-->
-	  <QuickAction-Server Category="Intune" Action="UpdateComplianceState" Name="Update ComplianceState" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="bc98eabc-353f-4866-bab0-681aafe48d7b">
+	  <!--<QuickAction-Server Category="Intune" Action="UpdateComplianceState" Name="Update ComplianceState" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="37453657-94a7-4e72-b8f4-eaa4b085536d">
 		  <Name Lang="DE">Intune Komformitätsstatus erzwingen</Name>
 		  <Name Lang="EN">Enforce Intune compliance state</Name>
 		  <Description Lang="DE">Komformitätsstatus aktualisieren</Description>
@@ -1096,7 +1096,7 @@
 		  <Icon IconType="material" Name="ic_verified_user" />
 	  </QuickAction-Server>
 
-	  <QuickAction-Server Category="Intune" Action="GetManagedApps"  Name="Get Managed Apps" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="e798637e-a315-4d88-aec8-e6f22f9f70c7" >
+	  <QuickAction-Server Category="Intune" Action="GetManagedApps"  Name="Get Managed Apps" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="157212a0-8d4b-4431-b119-86d9df92ef16" >
 		  <Name Lang="DE">Verwaltete Anwendungen anzeigen</Name>
 		  <Name Lang="EN">Show managed applications</Name>
 
@@ -1119,14 +1119,14 @@
 		  </ColumnOutputFormattings>
 	  </QuickAction-Server>
 
-	  <QuickAction-Local-WebRequest InformationClass="MobileDevice" Name="Open Intune (web)" RunImmediate="true" CheckNamedParameter="IntuneDeviceId" Section="MobileDevice" Id="fc162f02-286d-48ce-a9ec-94118e62b735">
+	  <QuickAction-Local-WebRequest InformationClass="MobileDevice" Name="Open Intune (web)" RunImmediate="true" CheckNamedParameter="IntuneDeviceId" Section="MobileDevice" Id="ec5d651d-dfc1-4e57-8713-1d5b7d418818">
 		  <Name Lang="DE">Intune Webseite öffnen</Name>
 		  <AlternativeDescription Lang="EN">This Quick Action requires information about the "Device".</AlternativeDescription>
 		  <AlternativeDescription Lang="DE">Um diese Quick Action verwenden zu können werden Informationen über das "Gerät" benötigt.</AlternativeDescription>
 		  <Icon IconType="material" Name="ic_open_in_browser" />
 		  <QueryString>https://intune.microsoft.com/#view/Microsoft_Intune_Devices/DeviceSettingsMenuBlade/~/overview/mdmDeviceId/PARAM_DeviceId</QueryString>
 		  <QueryParameter Name="PARAM_DeviceId" ParameterName="IntuneDeviceId" />
-	  </QuickAction-Local-WebRequest>
+	  </QuickAction-Local-WebRequest>-->
 	  
 	  
 	  <QuickAction-Server Category="Citrix" Action="SessionLogoff" ParamaterType ="sessionId" CheckNamedParameter="VirtualSessionStatus" Name="Session Logoff" InformationClass="VirtuelSession" Section ="Citrix" Id="da4662c3-1988-413a-a834-aec81508a8d1">
diff --git a/F4SDwebService/Publish/Config/F4SD-CopyTemplate-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-CopyTemplate-Configuration.xml
index 99bf31c..3a8a51b 100644
--- a/F4SDwebService/Publish/Config/F4SD-CopyTemplate-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-CopyTemplate-Configuration.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <F4SD-CopyTemplate-Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="F4SD-CopyTemplate-Configuration.xsd">
-	<CopyTemplates Default="Ticket-Information-Computer">
-		<CopyTemplate Name="Ticket-Information-Computer">
-			<Name Lang="DE">Ticket-Information-Computer</Name>
+	<CopyTemplates Default="Ticket Information-Computer">
+		<CopyTemplate Name="Ticket Information-Computer">
+			<Name Lang="DE">Ticket Information-Computer</Name>
 			<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
 			<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
 			<Icon Name="misc_ticket" IconType="intern"/>
@@ -29,20 +29,21 @@
 			</CopyContent>
 		</CopyTemplate>
 		<CopyTemplate Name="Ticket Information-VM">
-			<Name Lang="DE">Ticket Information VM</Name>
+			<Name Lang="DE">Ticket Information-VM</Name>
 			<Description Lang="EN">Transfers the relevant information for ticket creation to the clipboard.</Description>
 			<Description Lang="DE">Überträgt die relevanten Informationen für eine Ticket Erstellung in den Zwischenspeicher.</Description>
 			<Icon Name="misc_ticket" IconType="intern"/>
 			<CopyContent Format="UNICODE">
 				%VirtualSessionName.Label% %VirtualSessionName.Value%
-				%VirtualSessionStatus.Label% %VirtualSessionStatus.Value%
+				%DNSName.Label% %DNSName.Value%
+				%DomainName.Label% %DomainName.Value%
 				%HostedMachine.Label% %HostedMachine.Value%
-				%DeviceName.Label% %DeviceName.Value%
 			</CopyContent>
 			<CopyContent Format="HTML">
 				&lt;table border=&quot;1&quot; cellpadding=&quot;5,1,5,1&quot;&gt;&lt;tbody&gt;
 				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td style=&quot;color: #0000ff;&quot;&gt;%VirtualSessionName.Value%&lt;/td&gt;&lt;/tr&gt;
-				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%VirtualSessionStatus.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%VirtualSessionStatus.Value%&lt;/td&gt;&lt;/tr&gt;
+				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DNSName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DNSName.Value%&lt;/td&gt;&lt;/tr&gt;
+				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%DomainName.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%DomainName.Value%&lt;/td&gt;&lt;/tr&gt;
 				&lt;tr&gt;&lt;td&gt;&lt;em&gt;%HostedMachine.Label%&lt;/em&gt;&lt;/td&gt;&lt;td&gt;%HostedMachine.Value%&lt;/td&gt;&lt;/tr&gt;
 				&lt;/tbody&gt;&lt;/table&gt;
 			</CopyContent>
diff --git a/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
index db0156b..5e3bcc1 100644
--- a/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-HealthCard-Configuration.xml
@@ -1612,25 +1612,8 @@
 					<State-Translation Name="Maintenance Mode active" ValueTable="citrix-session-machine" ValueColumn="IsInMaintenanceMode" Translation="citrix_IsMaintanceModeActive" DefaultState="Ok">
 						<Name Lang="DE">Wartungsmodus aktiv</Name>
 					</State-Translation>
-				</StateCategory>
-				<StateCategory Name="MachineUsageInformationWidget">
-					<State-Info Name="Host Utilization Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
-						<Name Lang="DE">Host Nutzung-Informationen</Name>
-					</State-Info>
-					<State-Level Name="CPU Utilization" ValueTable="citrix-session-machine" ValueColumn="Cpu" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">CPU Auslastung</Name>
-					</State-Level>
-					<State-Level Name="RAM/Memory Utilization" ValueTable="citrix-session-machine" ValueColumn="Memory" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">RAM/Arbeitsspeicher Auslastung</Name>
-					</State-Level>
-					<State-Level Name="Disk Utilization" ValueTable="citrix-session-machine" ValueColumn="Disk" Display="PERCENT100" Direction="up" Warning="50" Error="80" DefaultState="Ok">
-						<Name Lang="DE">Speicher Auslastung</Name>
-					</State-Level>
-					<State-Info Name="Current Session Count" ValueTable="citrix-session-machine" ValueColumn="CurrentSessionCount">
-						<Name Lang="DE">Aktuelle Sitzungsanzahl</Name>
-					</State-Info>
-				</StateCategory>
-				<StateCategory Name="MachineMetricWidget">
+				</StateCategory>				
+				<StateCategory Name="MachineUsageMetricWidget">
 					<State-Info Name="Host Utilization Info" ValueTable="Computation_EmptyConstant" ValueColumn="default">
 						<Name Lang="DE">Host Nutzung-Informationen</Name>
 					</State-Info>
diff --git a/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml
index 04e2d79..ea81c56 100644
--- a/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-Infrastructure-Configuration.xml
@@ -76,7 +76,7 @@
     </AD-Scans>
   </Active-Directory>
 	<Azure-AD>
-    <Azure-Tenant Domain="c4it365.onmicrosoft.com" TenantID="8f773186-362b-4432-a3e9-d3ad4685f3f1" Credential="AzureAccess" ScanIntuneDevices = "true" WithMobileDevices="true">
+    <Azure-Tenant Domain="c4it365.onmicrosoft.com" TenantID="8f773186-362b-4432-a3e9-d3ad4685f3f1" Credential="AzureAccess" ScanIntuneDevices = "true" WithMobileDevices="false">
       <Azure-Filter-User UseBetaEnpoint="true" UseConsistencyLevelEventual="true">onPremisesExtensionAttributes/extensionAttribute8 in (&apos;C4IT&apos;, &apos;TS4U&apos;) and userType eq &apos;member&apos; and accountEnabled eq true</Azure-Filter-User>
     </Azure-Tenant>
 		<!--<Azure-Tenant Domain="sd0024.onmicrosoft.com" TenantID="07362148-410e-4636-a9cb-795fba1a5452" Credential="AzureAccess_Dieter"/>-->
diff --git a/F4SDwebService/Publish/Config/F4SD-QuickAction-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-QuickAction-Configuration.xml
index 6ca17fe..787f4fb 100644
--- a/F4SDwebService/Publish/Config/F4SD-QuickAction-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-QuickAction-Configuration.xml
@@ -1088,7 +1088,7 @@
 			  </AdjustableParameter-DropDown>
 		  </AdjustableParameters>
 	  </QuickAction-Server>-->
-	  <QuickAction-Server Category="Intune" Action="UpdateComplianceState" Name="Update ComplianceState" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="bc98eabc-353f-4866-bab0-681aafe48d7b">
+	  <!--<QuickAction-Server Category="Intune" Action="UpdateComplianceState" Name="Update ComplianceState" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="37453657-94a7-4e72-b8f4-eaa4b085536d">
 		  <Name Lang="DE">Intune Komformitätsstatus erzwingen</Name>
 		  <Name Lang="EN">Enforce Intune compliance state</Name>
 		  <Description Lang="DE">Komformitätsstatus aktualisieren</Description>
@@ -1096,7 +1096,7 @@
 		  <Icon IconType="material" Name="ic_verified_user" />
 	  </QuickAction-Server>
 
-	  <QuickAction-Server Category="Intune" Action="GetManagedApps"  Name="Get Managed Apps" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="e798637e-a315-4d88-aec8-e6f22f9f70c7" >
+	  <QuickAction-Server Category="Intune" Action="GetManagedApps"  Name="Get Managed Apps" ParamaterType ="deviceId" InformationClass="MobileDevice" Section ="MobileDevice" Id="157212a0-8d4b-4431-b119-86d9df92ef16" >
 		  <Name Lang="DE">Verwaltete Anwendungen anzeigen</Name>
 		  <Name Lang="EN">Show managed applications</Name>
 
@@ -1119,14 +1119,14 @@
 		  </ColumnOutputFormattings>
 	  </QuickAction-Server>
 
-	  <QuickAction-Local-WebRequest InformationClass="MobileDevice" Name="Open Intune (web)" RunImmediate="true" CheckNamedParameter="IntuneDeviceId" Section="MobileDevice" Id="fc162f02-286d-48ce-a9ec-94118e62b735">
+	  <QuickAction-Local-WebRequest InformationClass="MobileDevice" Name="Open Intune (web)" RunImmediate="true" CheckNamedParameter="IntuneDeviceId" Section="MobileDevice" Id="ec5d651d-dfc1-4e57-8713-1d5b7d418818">
 		  <Name Lang="DE">Intune Webseite öffnen</Name>
 		  <AlternativeDescription Lang="EN">This Quick Action requires information about the "Device".</AlternativeDescription>
 		  <AlternativeDescription Lang="DE">Um diese Quick Action verwenden zu können werden Informationen über das "Gerät" benötigt.</AlternativeDescription>
 		  <Icon IconType="material" Name="ic_open_in_browser" />
 		  <QueryString>https://intune.microsoft.com/#view/Microsoft_Intune_Devices/DeviceSettingsMenuBlade/~/overview/mdmDeviceId/PARAM_DeviceId</QueryString>
 		  <QueryParameter Name="PARAM_DeviceId" ParameterName="IntuneDeviceId" />
-	  </QuickAction-Local-WebRequest>
+	  </QuickAction-Local-WebRequest>-->
 	  
 	  
 	  <QuickAction-Server Category="Citrix" Action="SessionLogoff" ParamaterType ="sessionId" CheckNamedParameter="VirtualSessionStatus" Name="Session Logoff" InformationClass="VirtuelSession" Section ="Citrix" Id="da4662c3-1988-413a-a834-aec81508a8d1">