diff --git a/dmp-frontend/src/app/core/core-service.module.ts b/dmp-frontend/src/app/core/core-service.module.ts
index b151c7d8f..004a2de11 100644
--- a/dmp-frontend/src/app/core/core-service.module.ts
+++ b/dmp-frontend/src/app/core/core-service.module.ts
@@ -47,6 +47,7 @@ import { InAppNotificationService } from './services/inapp-notification/inapp-no
 import { NotificationService } from './services/notification/notification-service';
 import { SemanticsService } from './services/semantic/semantics.service';
 import { PrefillingSourceService } from './services/prefilling-source/prefilling-source.service';
+import { VisibilityRulesService } from '@app/ui/description/editor/description-form/visibility-rules/visibility-rules.service';
 //
 //
 // This is shared module that provides all the services. Its imported only once on the AppModule.
@@ -112,7 +113,8 @@ export class CoreServiceModule {
 				InAppNotificationService,
 				NotificationService,
 				SemanticsService,
-				PrefillingSourceService
+				PrefillingSourceService,
+				VisibilityRulesService
 			],
 		};
 	}
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.html
index 43ad7519e..1565b3ffd 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.html
@@ -1,7 +1,8 @@
 <div class="row" *ngFor="let ruleFormGroup of form['controls'] let i=index;" [formGroup]="ruleFormGroup">
 	<span class="col-auto align-self-center">{{i + 1}}</span>
 
-	<app-description-template-editor-default-value-component class="col align-self-center" [fieldType]="fieldTypeForCheck" [form]="ruleFormGroup.get('value')" [formArrayOptions]="formArrayOptionsForCheck" placeHolder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.RULE.FIELDS.RULE-IF'| translate}}" required="true"></app-description-template-editor-default-value-component>
+	<app-description-template-editor-default-value-component *ngIf="isTextType(fieldTypeForCheck)" class="col align-self-center" [fieldType]="fieldTypeForCheck" [form]="ruleFormGroup.get('textValue')" [formArrayOptions]="formArrayOptionsForCheck" placeHolder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.RULE.FIELDS.RULE-IF'| translate}}" required="true"></app-description-template-editor-default-value-component>
+	<app-description-template-editor-default-value-component *ngIf="isDateType(fieldTypeForCheck)" class="col align-self-center" [fieldType]="fieldTypeForCheck" [form]="ruleFormGroup.get('dateValue')" [formArrayOptions]="formArrayOptionsForCheck" placeHolder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.RULE.FIELDS.RULE-IF'| translate}}" required="true"></app-description-template-editor-default-value-component>
 
 	<!-- SELECTION -->
 	<mat-form-field class="col align-self-center">
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.ts
index 4246446c5..89a1ed900 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/visibility-rule/description-template-editor-visibility-rule.component.ts
@@ -39,6 +39,30 @@ export class DescriptionTemplateEditorRuleComponent implements OnInit {
 
 	}
 
+	isTextType(type: DescriptionTemplateFieldType){
+		return type == DescriptionTemplateFieldType.FREE_TEXT || type == DescriptionTemplateFieldType.CHECK_BOX || 
+			type == DescriptionTemplateFieldType.TEXT_AREA || type == DescriptionTemplateFieldType.RICH_TEXT_AREA ||
+			type == DescriptionTemplateFieldType.BOOLEAN_DECISION || type == DescriptionTemplateFieldType.RADIO_BOX ||
+			type == DescriptionTemplateFieldType.CURRENCY || type == DescriptionTemplateFieldType.SELECT;
+	}
+
+	isTextListType(type: DescriptionTemplateFieldType){
+		return type == DescriptionTemplateFieldType.TAGS || type == DescriptionTemplateFieldType.INTERNAL_ENTRIES_DMPS || 
+			type == DescriptionTemplateFieldType.INTERNAL_ENTRIES_DESCRIPTIONS;
+	}
+
+	isDateType(type: DescriptionTemplateFieldType){
+		return type == DescriptionTemplateFieldType.DATE_PICKER;
+	}
+
+	isReferenceType(type: DescriptionTemplateFieldType){
+		return type == DescriptionTemplateFieldType.REFERENCE_TYPES;
+	}
+
+	isExternalIdentifierType(type: DescriptionTemplateFieldType){
+		return type == DescriptionTemplateFieldType.VALIDATION || type == DescriptionTemplateFieldType.DATASET_IDENTIFIER;;
+	}
+
 	targetValidation() {
 		//TODO
 	}
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
index 05dcb1d71..065ede96c 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
@@ -139,9 +139,9 @@
 									<!-- <mat-form-field>
 											<input matInput #email placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}" (focus)="onUserFieldFocus()" (blur)="onUserFieldBlur()" (keyup.enter)="addUser(email)">
 										</mat-form-field> -->
-									<mat-form-field class="full-width basic-info-input">
+									<mat-form-field class="full-width basic-info-input" *ngIf="!formGroup.disabled">
 										<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}</mat-label>
-										<app-single-auto-complete [disabled]="formGroup.disabled" [required]="false" [formControl]="userFormControl" (optionSelected)="addUser($event)" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}" [configuration]="userService.singleAutocompleteConfiguration">
+										<app-single-auto-complete [required]="false" [formControl]="userFormControl" (optionSelected)="addUser($event)" placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS' | translate}}" [configuration]="userService.singleAutocompleteConfiguration">
 										</app-single-auto-complete>
 										<mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 									</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts
index 735a1ab04..baf3c2b52 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts
@@ -951,7 +951,7 @@ export class DescriptionTemplateRuleEditorModel implements DescriptionTemplateRu
 			validationErrorModel
 		});
 
-		['target', 'value'].forEach(keyField => {
+		['target', 'textValue', 'textListValue', 'dateValue'].forEach(keyField => {
 			const control = formGroup?.get(keyField);
 			control?.clearValidators();
 			control?.addValidators(context.getValidation(keyField).validators);
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
index a6d8faf1a..2ca81178f 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
@@ -13,10 +13,10 @@
 	</div>
 	<div *ngIf="!fieldSet?.multiplicity?.tableView" class="col-12">
 		<div class="row" *ngFor="let fieldSetItemPropertiesControl of propertiesFormGroup?.get('items')?.controls">
-			<div class="col" *ngIf="visibilityRulesService.isVisibleMap[fieldSet.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
+			<div class="col" *ngIf="visibilityRulesService && visibilityRulesService.isVisibleMap[fieldSet.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
 				<div class="row">
 					<div *ngFor="let field of fieldSet.fields; let i = index;" class="col-12 compositeField">
-						<ng-container  *ngIf="visibilityRulesService.isVisibleMap[field.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
+						<ng-container  *ngIf="visibilityRulesService && visibilityRulesService.isVisibleMap[field.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
 							<div class="row">
 								<h5 *ngIf="placeholderTitle" class="col-auto font-weight-bold">{{field.label}}</h5>
 							</div>
@@ -48,9 +48,9 @@
 				<th class="actions"></th>
 			</tr>
 			<ng-container *ngFor="let fieldSetItemPropertiesControl of propertiesFormGroup?.get('items')?.controls; let j = index">
-				<tr *ngIf="visibilityRulesService.isVisibleMap[fieldSet.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
+				<tr *ngIf="visibilityRulesService && visibilityRulesService.isVisibleMap[fieldSet.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
 					<td *ngFor="let field of fieldSet.fields;" class="text-wrap">
-						<ng-container  *ngIf="visibilityRulesService.isVisibleMap[field.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
+						<ng-container  *ngIf="visibilityRulesService && visibilityRulesService.isVisibleMap[field.id + '_' + fieldSetItemPropertiesControl.get('ordinal').value]">
 							{{fieldSetItemPropertiesControl.get('fields').get(field.id).get('value').getRawValue()}}
 						</ng-container>
 					</td>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts b/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts
index 3662abe15..e6f977974 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts
@@ -33,7 +33,7 @@ export class DescriptionFormAnnotationService extends BaseService {
 	}
 
 	public getCount(anchor: string) {
-		if (this.annotationsPerAnchor.has(anchor)) {
+		if (this.annotationsPerAnchor != null && this.annotationsPerAnchor.has(anchor)) {
 			return this.annotationsPerAnchor.get(anchor);
 		} else {
 			return 0;