diff --git a/backend/core/src/main/java/org/opencdmp/query/LockQuery.java b/backend/core/src/main/java/org/opencdmp/query/LockQuery.java
index 1fd1883df..0e19ea833 100644
--- a/backend/core/src/main/java/org/opencdmp/query/LockQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/LockQuery.java
@@ -177,7 +177,7 @@ public class LockQuery extends QueryBase<LockEntity> {
         if (this.like != null && !this.like.isEmpty()) {
             this.like = this.like.replaceAll("%", "");
             if (this.conventionService.isValidUUID(this.like)){
-                CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(LockEntity._id));
+                CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(LockEntity._target));
                 inClause.value(UUID.fromString(this.like));
                 predicates.add(inClause);
             }
diff --git a/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java b/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
index bd2fa37b2..a825f0aa7 100644
--- a/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
@@ -380,7 +380,7 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
             return ReferenceEntity._typeId;
         else if (item.prefix(Reference._createdBy))
             return ReferenceEntity._createdById;
-        else if (item.prefix(Reference._belongsToCurrentTenant))
+        else if (item.match(Reference._belongsToCurrentTenant))
             return ReferenceEntity._tenantId;
         else
             return null;
diff --git a/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts b/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
index 499b4f8a5..ebd4d8607 100644
--- a/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
+++ b/frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
@@ -115,6 +115,7 @@ export class PrefillingSourceEditorComponent extends BaseEditor<PrefillingSource
 
 	buildForm() {
 		this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditPrefillingSource));
+		if (this.isDeleted || !this.authService.hasPermission(AppPermission.EditPrefillingSource)) this.formGroup.disable();
 		this.prefillingSourceEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
 		this.addFieldMapping("reference_id", "searchConfiguration");
 		this.addFieldMapping("label", "searchConfiguration");
diff --git a/frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts b/frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
index c9401689a..521b3ced0 100644
--- a/frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
+++ b/frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
@@ -147,7 +147,7 @@ export class DefinitionEditorModel implements DefinitionPersist {
 
 		const baseContext: ValidationContext = new ValidationContext();
 		const baseValidationArray: Validation[] = new Array<Validation>();
-		baseValidationArray.push({ key: 'fields', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}fields`)] });
+		baseValidationArray.push({ key: 'fields', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}fields`)] });
 
 		baseContext.validation = baseValidationArray;
 		return baseContext;
diff --git a/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts b/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
index 485797039..29e94883f 100644
--- a/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
+++ b/frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
@@ -163,6 +163,7 @@ export class NotificationTemplateEditorComponent extends BaseEditor<Notification
 
 	buildForm() {
 		this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditNotificationTemplate));
+		if (this.isDeleted || !this.authService.hasPermission(AppPermission.EditNotificationTemplate)) this.formGroup.disable();
 		this.notificationTemplateEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
 		NotificationTemplateEditorModel.reApplyValueValidators({
 			formGroup: this.formGroup,