diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
index 8e5bdfbda..101bfaf98 100644
--- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
+++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts
@@ -181,7 +181,10 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
 	}
 
 	stringify(value: any): string {
-		return JSON.stringify(value);
+		if (typeof value === 'string' || value instanceof String)
+			return value as string;
+		else
+			return JSON.stringify(value);
 	}
 
 	isNullOrEmpty(query: string): boolean {
@@ -204,7 +207,7 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
 		const newValue = this._valueToAssign(item);
 
 		//Update selected items
-		this._selectedItems.set(JSON.stringify(this.configuration.uniqueAssign != null ? this.configuration.uniqueAssign(newValue) : newValue), item);
+		this._selectedItems.set(this.stringify(this.configuration.uniqueAssign != null ? this.configuration.uniqueAssign(newValue) : newValue), item);
 
 		this._setValue(newValue);
 
@@ -244,7 +247,7 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
 	public onBlur($event: MouseEvent) {
 		if (this.value != null) {
 			const inputLabel = this.inputValue;
-			const selectedLabel = this._displayFn(this._selectedItems.get(this.selectedItemKey(this.value)));
+			const selectedLabel = this._displayFn(this._selectedItems.get(this.configuration.uniqueAssign != null ? this.configuration.uniqueAssign(this.value) : this.value));
 			if (inputLabel && selectedLabel !== inputLabel) {
 				this.inputValue = selectedLabel;
 			}
@@ -344,7 +347,7 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple
 	}
 
 	private selectedItemKey(item: any) {
-		return JSON.stringify(
+		return this.stringify(
 			this.configuration.uniqueAssign != null ? this.configuration.uniqueAssign(item) :
 				this.configuration.valueAssign != null ? this.configuration.valueAssign(item) : item
 		)
diff --git a/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html b/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
index 3c130aef2..abd4117ef 100644
--- a/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
+++ b/dmp-frontend/src/app/ui/external-fetcher/external-fetcher-source.component.html
@@ -311,63 +311,65 @@
 			</div>
 		</div>
 	</div>
-	
+
 	<!-- Static Items -->
-	<div class="row" *ngIf="formGroup.get('type').value == externalFetcherSourceType.STATIC">
-		<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.STATIC-ITEMS' | translate}}</h3>
-		<div class="col-12">
-			<div *ngFor="let staticItem of formGroup.get('items').controls; let staticIndex=index;" class="row mb-3">
-				<div class="col-12">
-					<mat-card-header>
-						<div class="row mb-3 d-flex align-items-center">
-							<div class="col-auto d-flex">
-								<h4 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.STATIC-ITEM' | translate}} {{staticIndex + 1}}</h4>
+	<div class="col-12" *ngIf="formGroup.get('type').value == externalFetcherSourceType.STATIC">
+		<div class="row">
+			<h3 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.STATIC-ITEMS' | translate}}</h3>
+			<div class="col-12">
+				<div *ngFor="let staticItem of formGroup.get('items').controls; let staticIndex=index;" class="row mb-3">
+					<div class="col-12">
+						<mat-card-header>
+							<div class="row mb-3 d-flex align-items-center">
+								<div class="col-auto d-flex">
+									<h4 class="col-12">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.STATIC-ITEM' | translate}} {{staticIndex + 1}}</h4>
+								</div>
 							</div>
-						</div>
-						<div class="col-auto d-flex">
-							<button mat-icon-button class="action-list-icon" matTooltip="{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.REMOVE-STATIC-ITEM' | translate}}" (click)="removeStaticItem(staticIndex)" [disabled]="formGroup.disabled">
-								<mat-icon>delete</mat-icon>
-							</button>
-						</div>
-					</mat-card-header>
-					<mat-card-content>
-						<!-- Static Options -->
-						<div *ngFor="let option of staticItem.get('options').controls; let optionIndex=index;" class="row">
-							<div class="col-12">
-								<div class="row mb d-flex align-items-center">
-									<div class="col-auto d-flex">
-										<span>{{optionIndex + 1}}</span>
-									</div>
-									<div class="col">
-										<div class="row">
-											<div class="col-6">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
-													<input matInput type="text" [readonly]="option.get('code').disabled" name="code" [formControl]="option.get('code')">
-													<mat-error *ngIf="option.get('code').hasError('backendError')">{{option.get('code').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="option.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
-											</div>
-											<div class="col-6">
-												<mat-form-field class="w-100">
-													<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.VALUE' | translate}}</mat-label>
-													<input matInput type="text" name="value" [formControl]="option.get('value')">
-													<mat-error *ngIf="option.get('value').hasError('backendError')">{{option.get('value').getError('backendError').message}}</mat-error>
-													<mat-error *ngIf="option.get('value').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-												</mat-form-field>
+							<div class="col-auto d-flex">
+								<button mat-icon-button class="action-list-icon" matTooltip="{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.REMOVE-STATIC-ITEM' | translate}}" (click)="removeStaticItem(staticIndex)" [disabled]="formGroup.disabled">
+									<mat-icon>delete</mat-icon>
+								</button>
+							</div>
+						</mat-card-header>
+						<mat-card-content>
+							<!-- Static Options -->
+							<div *ngFor="let option of staticItem.get('options').controls; let optionIndex=index;" class="row">
+								<div class="col-12">
+									<div class="row mb d-flex align-items-center">
+										<div class="col-auto d-flex">
+											<span>{{optionIndex + 1}}</span>
+										</div>
+										<div class="col">
+											<div class="row">
+												<div class="col-6">
+													<mat-form-field class="w-100">
+														<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
+														<input matInput type="text" [readonly]="option.get('code').disabled" name="code" [formControl]="option.get('code')">
+														<mat-error *ngIf="option.get('code').hasError('backendError')">{{option.get('code').getError('backendError').message}}</mat-error>
+														<mat-error *ngIf="option.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+													</mat-form-field>
+												</div>
+												<div class="col-6">
+													<mat-form-field class="w-100">
+														<mat-label>{{'EXTERNAL-FETCHER-SOURCE-EDITOR.FIELDS.VALUE' | translate}}</mat-label>
+														<input matInput type="text" name="value" [formControl]="option.get('value')">
+														<mat-error *ngIf="option.get('value').hasError('backendError')">{{option.get('value').getError('backendError').message}}</mat-error>
+														<mat-error *ngIf="option.get('value').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+													</mat-form-field>
+												</div>
 											</div>
 										</div>
 									</div>
 								</div>
 							</div>
-						</div>		
-					</mat-card-content>
+						</mat-card-content>
+					</div>
 				</div>
+				<button mat-button class="action-btn" type="button" (click)="addStaticItem()" [disabled]="formGroup.disabled">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.ADD-STATIC-ITEM' | translate}}</button>
 			</div>
-			<button mat-button class="action-btn" type="button" (click)="addStaticItem()" [disabled]="formGroup.disabled">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.ACTIONS.ADD-STATIC-ITEM' | translate}}</button>
+			<mat-error *ngIf="formGroup.get('items').dirty && formGroup.get('items').hasError('required')">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.STATIC-ITEMS-REQUIRED' | translate}}</mat-error>
+			<mat-error *ngIf="formGroup.get('items').hasError('backendError')">{{formGroup.get('items').getError('backendError').message}}</mat-error>
 		</div>
-		<mat-error *ngIf="formGroup.get('items').dirty && formGroup.get('items').hasError('required')">{{'EXTERNAL-FETCHER-SOURCE-EDITOR.STATIC-ITEMS-REQUIRED' | translate}}</mat-error>
-		<mat-error *ngIf="formGroup.get('items').hasError('backendError')">{{formGroup.get('items').getError('backendError').message}}</mat-error>
 	</div>
 
 </div>
\ No newline at end of file