diff --git a/.drone.yml b/.drone.yml
index 0b3fd8356..7b2d85c51 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -206,7 +206,7 @@ matrix:
     - TESTS: php7.2
     - TESTS: eslint
     - TESTS: jsbuild
-    - TESTS: integration
+    #- TESTS: integration
 
 branches: [ master, stable* ]
 
diff --git a/css/style.scss b/css/style.scss
index 092f61edb..1f6f77fbd 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -727,6 +727,7 @@ input.input-inline {
 			}
 			.tooltip {
 				z-index: 998;
+				position: fixed;
 			}
 		}
 	}
diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index 786b3260a..0a7e9a5d7 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -79,7 +79,6 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
 				header.find('.save-indicator.unsaved').hide();
 				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
 				StackService.updateCard($scope.status.edit);
-				BoardService.$scope.$digest();
 			});
 		}
 	}, 500, 0, false);
diff --git a/js/service/ApiService.js b/js/service/ApiService.js
index dbb1b56e9..1ffaad41a 100644
--- a/js/service/ApiService.js
+++ b/js/service/ApiService.js
@@ -124,7 +124,9 @@ app.factory('ApiService', function ($http, $q) {
 			this.data[entity.id] = entity;
 		} else {
 			Object.keys(entity).forEach(function (key) {
-				element[key] = entity[key];
+				if (entity[key] !== null) {
+					element[key] = entity[key];
+				}
 			});
 			element.status = {};
 		}
diff --git a/lib/Db/RelationalEntity.php b/lib/Db/RelationalEntity.php
index 1dc619758..188a36897 100644
--- a/lib/Db/RelationalEntity.php
+++ b/lib/Db/RelationalEntity.php
@@ -71,7 +71,7 @@ public function jsonSerialize() {
 		foreach ($properties as $property => $value) {
 			if (strpos($property, '_') !== 0 && $reflection->hasProperty($property)) {
 				$propertyReflection = $reflection->getProperty($property);
-				if (!$propertyReflection->isPrivate()) {
+				if (!$propertyReflection->isPrivate() && !in_array($property, $this->_resolvedProperties, true)) {
 					$json[$property] = $this->getter($property);
 				}
 			}
diff --git a/templates/part.card.php b/templates/part.card.php
index c6f619739..2880c782e 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -66,7 +66,7 @@
 			</ui-select-choices>
 		</ui-select>
 		<div class="card-details-assign-users-list">
-			<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers track by user.uid">
+			<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers track by user.participant.uid">
 				<avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ user.participant.uid }}" ng-attr-displayname="{{ user.participant.displayname }}" contactsmenudelete ></avatar>
 			</div>
 		</div>