diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index 31d7826c626..24efaedbc23 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -958,7 +958,8 @@ public static <C extends Containerable> String getDisplayName(PrismContainerValu
 		}
 		if (containerable instanceof AbstractPolicyConstraintType){
 			AbstractPolicyConstraintType constraint = (AbstractPolicyConstraintType) containerable;
-			String displayName = (StringUtils.isEmpty(constraint.getName()) ? (constraint.asPrismContainerValue().getPath().last()) : constraint.getName())
+			String displayName = (StringUtils.isEmpty(constraint.getName()) ? (constraint.asPrismContainerValue().getParent().getPath().last())
+					: constraint.getName())
 					+ (StringUtils.isEmpty(constraint.getDescription()) ? "" : (" - " + constraint.getDescription()));
 			return displayName;
 		}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
index dcfe718170c..dcf4926abeb 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
@@ -229,14 +229,13 @@ protected int getItemsPerPage() {
 
 	protected ObjectQuery createObjectQuery() {
         QName relation = getRelation();
-        S_AtomicFilterExit tempFilter =  QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext())
-                .block()
-                .not()
-                .item(new ItemPath(AssignmentType.F_CONSTRUCTION, ConstructionType.F_RESOURCE_REF))
-                .isNull()
-                .endBlock();
         if (PrismConstants.Q_ANY.equals(relation)){
-            return tempFilter
+            return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext())
+                    .block()
+                    .not()
+                    .item(new ItemPath(AssignmentType.F_CONSTRUCTION, ConstructionType.F_RESOURCE_REF))
+                    .isNull()
+                    .endBlock()
                     .or()
                     .block()
                     .not()
@@ -245,8 +244,7 @@ protected ObjectQuery createObjectQuery() {
                     .endBlock()
                     .build();
         } else {
-            return tempFilter
-                    .or()
+            return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext())
                     .item(new ItemPath(AssignmentType.F_TARGET_REF))
                     .ref(relation)
                     .build();