diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs
index e1e5ea228..934ca8f88 100644
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -6,13 +6,15 @@ using System.ServiceModel;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-
+using System.Windows.Controls;
+using System.Windows.Threading;
 using BeWo.Multitenancy;
 using BeWo.Security;
 
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
+using DevExpress.CodeParser;
 
 namespace BeWo.ServiceProxy
 {
@@ -281,9 +283,16 @@ namespace BeWo.ServiceProxy
 		{
 			DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, true);
 		}
-		public static void DoGkvAccountingServiceAsyncGUI<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallBack)
+		public static void DoGkvAccountingServiceAsyncGUI<T>(Func<IGkvAccountingService, T> pFunc, Action<T> pCallBack, Dispatcher dispatcher)
 		{
-			DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, pCallBack, true);
+			Action<T> action = (t) => dispatcher.BeginInvoke(
+				DispatcherPriority.Normal,
+				(Action)delegate
+				{
+					pCallBack(t);
+				}); 
+
+			DoAsync<GkvAccountingServiceClient, IGkvAccountingService, T>(pFunc, action, true);
 		}
 
 		public static void DoGkvAccountingServiceAsync(Action<IGkvAccountingService> pAction)
diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
index c7133a75b..32c53f51e 100644
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
@@ -64,9 +64,10 @@ namespace BeWo.View.Controls
 
 			var oid = protokoll.GkvTransferProtokollOid.Value;
 
-			ServiceFacade.DoGkvAccountingServiceAsync(
+			ServiceFacade.DoGkvAccountingServiceAsyncGUI(
 				service => service.GetProtokollRawDataString(oid, BS.Shared.GkvRawDataType.Auftragsdatei),
-				callback => ShowTextViewer("Auftragsdatei", callback));
+				callback => ShowTextViewer("Auftragsdatei", callback),
+				Dispatcher);
 		}
 
 		private void btn_nutzdatendatei_Click(object sender, RoutedEventArgs e)
@@ -75,9 +76,10 @@ namespace BeWo.View.Controls
 
 			var oid = protokoll.GkvTransferProtokollOid.Value;
 
-			ServiceFacade.DoGkvAccountingServiceAsync(
+			ServiceFacade.DoGkvAccountingServiceAsyncGUI(
 				service => service.GetProtokollRawDataString(oid, BS.Shared.GkvRawDataType.Nutzdatendatei),
-				callback => ShowTextViewer("Nutzdatendatei", callback));
+				callback => ShowTextViewer("Nutzdatendatei", callback),
+				Dispatcher);
 		}
 
 		private void ShowTextViewer(string title, string text)
diff --git a/Data/Access/ScriptDAO.cs b/Data/Access/ScriptDAO.cs
index 6530d2449..ce9268ace 100644
--- a/Data/Access/ScriptDAO.cs
+++ b/Data/Access/ScriptDAO.cs
@@ -41,24 +41,5 @@ namespace BeWo.Data.Access
 
 			return rtn;
 		}
-
-		public string GetGkvRawData(long oid, GkvRawDataType gkvRawData)
-		{
-
-
-			if (gkvRawData == GkvRawDataType.Auftragsdatei)
-			{
-			
-			}
-			else if (gkvRawData == GkvRawDataType.Nutzdatendatei)
-			{
-
-			}
-			else
-			{
-				throw new NotImplementedException($"GkvRawDataType \'{gkvRawData}\' unbekannt.");
-			}
-			return null;
-		}
 	}
 }
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 991b1f2ce..361b57e4b 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs b/Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
index 943bef61a..0b1c0cc02 100644
--- a/Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
+++ b/Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
@@ -40,7 +40,7 @@ namespace BeWo.Service.ServiceBehavior
 
 				if (seg.EndsWith(".svc"))
 				{
-					lInterface = seg.Substring(0, seg.Length - 4);
+					lInterface = "I" + seg.Substring(0, seg.Length - 4);
 				}
 			}
 
diff --git a/Service/ServiceImplementations/GkvAccountingServiceImp.cs b/Service/ServiceImplementations/GkvAccountingServiceImp.cs
index b9ea23fe6..20854b9cb 100644
--- a/Service/ServiceImplementations/GkvAccountingServiceImp.cs
+++ b/Service/ServiceImplementations/GkvAccountingServiceImp.cs
@@ -110,7 +110,7 @@ namespace BeWo.Service.ServiceImplementations
 					throw new ArgumentOutOfRangeException(nameof(oid), $"oid \'{oid}\' nicht positiv");
 				}
 
-				var str = DAOFactory.ScriptDAO.GetGkvRawData(oid, gkvRawData);
+				var str = DAOFactory.SearchDAO.GetGkvRawData(oid, gkvRawData);
 
 				return str;
 			}
diff --git a/Service/ServiceUtils/ServiceHelper.cs b/Service/ServiceUtils/ServiceHelper.cs
index 711348316..476262ff6 100644
--- a/Service/ServiceUtils/ServiceHelper.cs
+++ b/Service/ServiceUtils/ServiceHelper.cs
@@ -54,7 +54,7 @@ namespace BeWo.Service.ServiceUtils
 			try
 			{
 				// Hole entsprechende Methode
-				var name = $"BeWo.Service.ServiceContracts.I{pServiceInterface}";
+				var name = $"BeWo.Service.ServiceContracts.{pServiceInterface}";
 				var t = Type.GetType(name);
 				methodInfo = t.GetMethod(pMethodName);
 			}