diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
index de8b74c312..af23ad0501 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
@@ -5,7 +5,7 @@
         </div>
         <div *ngIf="(editable | async)" class="field-container">
             <ds-filter-input-suggestions [suggestions]="(metadataFieldSuggestions | async)"
-                                  [(ngModel)]="metadata.key"
+                                         [(ngModel)]="metadata.key"
                                   (submitSuggestion)="update(suggestionControl)"
                                   (clickSuggestion)="update(suggestionControl)"
                                   (typeSuggestion)="update(suggestionControl)"
@@ -17,6 +17,8 @@
                                   [ngModelOptions]="{standalone: true}"
             ></ds-filter-input-suggestions>
         </div>
+        <small class="text-danger"
+               *ngIf="(valid | async) === false">{{"item.edit.metadata.metadatafield.invalid" | translate}}</small>
     </div>
 </td>
 <td class="w-100">
diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
index 2936119d49..e4040e34fb 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
@@ -17,6 +17,7 @@ import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
 import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
 import { SharedModule } from '../../../../shared/shared.module';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import { EditInPlaceFieldComponent } from './edit-in-place-field.component';
 
 let comp: EditInPlaceFieldComponent;
@@ -57,7 +58,7 @@ const fieldUpdate = {
 };
 let scheduler: TestScheduler;
 
-fdescribe('EditInPlaceFieldComponent', () => {
+describe('EditInPlaceFieldComponent', () => {
 
   beforeEach(async(() => {
     scheduler = getTestScheduler();
@@ -211,7 +212,7 @@ fdescribe('EditInPlaceFieldComponent', () => {
 
     it('it should call queryMetadataFields on the metadataFieldService with the correct query', () => {
 
-      expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query);
+      expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query, null, followLink('schema'));
     });
 
     it('it should set metadataFieldSuggestions to the right value', () => {
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index e09a869091..783201b6a1 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -8,6 +8,7 @@
          [ngClass]="{'is-invalid': !valid}"
          [dsDebounce]="debounceTime" (onDebounce)="find($event)"
          [placeholder]="placeholder"
+         ng-model-options="{standalone: true}"
          autocomplete="off">
   <input type="submit" class="d-none"/>
   <small class="text-danger"
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index 98a94f8edc..1c18ec4cef 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -37,7 +37,7 @@ export class FilterInputSuggestionsComponent extends InputSuggestionsComponent i
 
   ngOnInit() {
     this.form = new FormGroup({
-      metadataNameField: new FormControl('', {
+      metadataNameField: new FormControl(this._value, {
         asyncValidators: [this.metadataFieldValidator.validate.bind(this.metadataFieldValidator)],
         validators: [Validators.required]
       })