diff --git a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
index 0f4efa564..40bf0e0af 100644
--- a/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
+++ b/BeWo/View/Controls/GkvAbrechnungDetailControl.xaml
@@ -58,7 +58,7 @@
                         Grid.Column="2"
                         IsEnabled="False"
                         Style="{StaticResource TextEditNumber}"
-                        Text="{Binding Oid}" />
+                        Text="{Binding Oid, Mode=OneWay}" />
                     <Label
                         Grid.Row="1"
                         Grid.Column="0"
@@ -154,7 +154,7 @@
                         Grid.Column="2"
                         MaxLength="1024"
                         Style="{StaticResource TextBoxNoticeLarge}"
-                        Text="{Binding Notice}"
+                        Text="{Binding Notice, UpdateSourceTrigger=PropertyChanged}"
                         TextWrapping="Wrap" />
                 </Grid>
             </TabItem>
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index e66ba5c5e..f6bdf7844 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -75,8 +75,8 @@ namespace BeWo.View.Detail.Accounting
 				var filter = new GkvAbrechnungViewFilterDC();
 
 				filter.FilterTime = true;
-				filter.Start = _Viewmodel.DateTimeSpanFilter.StartDate;
-				filter.End = _Viewmodel.DateTimeSpanFilter.EndDate;
+				filter.Start = _Viewmodel.DateTimeSpanFilter?.StartDate;
+				filter.End = _Viewmodel.DateTimeSpanFilter?.EndDate;
 				filter.FilterForCreationDate = true;
 
 				ServiceFacade.DoGkvAccountingServiceAsync(
@@ -237,17 +237,12 @@ namespace BeWo.View.Detail.Accounting
 
 		private void Detail_Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
 		{
-			var bewo_window = sender as AnimatedBeWoWindow;
-			var detail_control = bewo_window.GroupBoxContent as GkvAbrechnungDetailControl;
-
-			var vm = detail_control.DataContext as GkvAbrechnungLightVM;
+			var dialog = sender as GkvAbrechnungDialogViewModel;
+			var vm = dialog.Abrechnung;
 
 			vm.CheckAllInvoiceBases();
 
-			var checkbox_checked = detail_control.Checkbox_Bezahlt.IsChecked;
-			var textbox_text = detail_control.txt_Notice.Text;
-
-			vm.Notice = textbox_text;
+			//vm.Notice = textbox_text;
 
 			if (vm.IsDirty)
 			{
diff --git a/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs b/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
index 5f07d28bc..a182d933d 100644
--- a/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
+++ b/BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs
@@ -26,8 +26,6 @@ namespace BeWo.ViewModel.Light
 
 		public static string PropertyName_ErstelltAm = "ErstelltAm";
 
-		private long _Oid;
-		private long _Version;
 		private string _Notice;
 
 		private long _OrganisationOid;
@@ -118,31 +116,11 @@ namespace BeWo.ViewModel.Light
 		public DateTime ErstelltAmDate => ErstelltAm.Date;
 		public long Oid
 		{
-			get { return this._Oid; }
-
-			set
-			{
-				if (this.AreDifferent(this._Oid, value))
-				{
-					this._Oid = value;
-					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Oid, value), nameof(Oid));
-					this.FirePropertyChanged(nameof(Oid));
-				}
-			}
+			get => DataContract.Oid;
 		}
 		public long Version
 		{
-			get { return this._Version; }
-
-			set
-			{
-				if (this.AreDifferent(this._Version, value))
-				{
-					this._Version = value;
-					this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Version, value), nameof(Version));
-					this.FirePropertyChanged(nameof(Version));
-				}
-			}
+			get => DataContract.Version;
 		}
 		public string Notice
 		{
@@ -352,7 +330,7 @@ namespace BeWo.ViewModel.Light
 
 		public override void UpdateByDataContract(GkvAbrechnungLightDC pDataContract)
 		{
-			Version = pDataContract.Version;
+			DataContract = pDataContract;
 
 			Notice = pDataContract.Notice;
 
@@ -373,9 +351,6 @@ namespace BeWo.ViewModel.Light
 
 			_ErstelltAm = pDataContract.ErstelltAm;
 
-			_Oid = pDataContract.Oid;
-			_Version = pDataContract.Version;
-
 			_Notice = pDataContract.Notice;
 
 			_Betrag = pDataContract.Betrag;
@@ -402,8 +377,6 @@ namespace BeWo.ViewModel.Light
 		}
 		protected override GkvAbrechnungLightDC MapToDataContract(GkvAbrechnungLightDC pDataContract, bool doCommit)
 		{
-			pDataContract.Version = _Version;
-
 			pDataContract.Notice = _Notice;
 			pDataContract.Betrag = _Betrag;
 			pDataContract.Bezahlt = _Bezahlt;
@@ -421,7 +394,6 @@ namespace BeWo.ViewModel.Light
 				return;
 			}
 
-			Version = dc.Version;
 			Protokolle = dc.Protokolle.ToList();
 
 			IsReady2Send = dc.IsReady2Send;