diff --git a/BeWo/ViewModel/WohnheimVM.cs b/BeWo/ViewModel/WohnheimVM.cs
index e8a1d6a8a..896998e1d 100644
--- a/BeWo/ViewModel/WohnheimVM.cs
+++ b/BeWo/ViewModel/WohnheimVM.cs
@@ -489,6 +489,7 @@ namespace BeWo.ViewModel
 
             //pDataContract.Wohneinheiten = _WohneinheitListVM.CopyToDCList(doCommit);
 
+            pDataContract.Wohneinheiten = null;
             var einheit_vm2dc = new Dictionary<WohneinheitVM, WohneinheitDC>();
             foreach (var vm in _WohneinheitListVM.VMList)
             {
@@ -499,8 +500,7 @@ namespace BeWo.ViewModel
 
                 einheit_vm2dc.Add(vm, dc);
 
-                if(!pDataContract.Wohneinheiten.Contains(dc))
-                    pDataContract.Wohneinheiten.Add(dc);
+                pDataContract.Wohneinheiten.Add(dc);
             }
 
             foreach (var vm in _WohneinheitBelegungListVM.VMList)
diff --git a/Model/Changes_2024_08_27 Wohneinheit Grundrisse.txt b/Model/Changes_2024_08_27 Wohneinheit Grundrisse.txt
index 02d1763ca..a73f39e15 100644
--- a/Model/Changes_2024_08_27 Wohneinheit Grundrisse.txt	
+++ b/Model/Changes_2024_08_27 Wohneinheit Grundrisse.txt	
@@ -9,17 +9,21 @@ DROP INDEX `KEY_EMPLOYEE` ,
 DROP INDEX `KEY_CUSTOMER` ;
 ;
 ALTER TABLE `image` 
+ADD INDEX `FK_IMAGE_PERSON_idx` (`PersonOid` ASC) VISIBLE,
+ADD INDEX `FK_IMAGE_WOHNEINHEIT_idx` (`WohneinheitOid` ASC) VISIBLE;
+;
+ALTER TABLE `image` 
 ADD CONSTRAINT `FK_IMAGE_PERSON`
-  FOREIGN KEY (`Oid`)
+  FOREIGN KEY (`PersonOid`)
   REFERENCES `person` (`Oid`)
   ON DELETE CASCADE
   ON UPDATE CASCADE,
 ADD CONSTRAINT `FK_IMAGE_WOHNEINHEIT`
-  FOREIGN KEY (`Oid`)
+  FOREIGN KEY (`WohneinheitOid`)
   REFERENCES `wohneinheit` (`Oid`)
   ON DELETE CASCADE
   ON UPDATE CASCADE;
 ;
 ALTER TABLE `image` 
 ADD COLUMN `Filename` VARCHAR(1024) NULL DEFAULT NULL AFTER `SystemEntryID`,
-ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;
+ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;
\ No newline at end of file
diff --git a/Service/DCEntityMapper/ImageDC_Image.cs b/Service/DCEntityMapper/ImageDC_Image.cs
index d0d66985a..a2f6a6536 100644
--- a/Service/DCEntityMapper/ImageDC_Image.cs
+++ b/Service/DCEntityMapper/ImageDC_Image.cs
@@ -15,6 +15,10 @@ namespace BeWo.Service.DCEntityMapper
     {
         public override ImageDC MergeWithDC(Image pEntity, ImageDC pDataContract)
         {
+            pDataContract.Oid = pEntity.Oid;
+            pDataContract.Version = pEntity.Version;
+            pDataContract.Notice = pEntity.Notice;
+
             pDataContract.Filename = pEntity.Filename;
             pDataContract.Fullname = pEntity.Fullname;
             pDataContract.Original = pEntity.Original;
@@ -26,6 +30,10 @@ namespace BeWo.Service.DCEntityMapper
 
         public override Image MergeWithEntity(ImageDC pDataContract, Image pEntity)
         {
+            pEntity.Oid = pDataContract.Oid;
+            pEntity.Version = pDataContract.Version;
+            pEntity.Notice = pDataContract.Notice;
+
             pEntity.Filename = pDataContract.Filename;
             pEntity.Fullname = pDataContract.Fullname;
             pEntity.Original = pDataContract.Original;