diff --git a/src/Squidex/app/features/content/shared/content-status.component.html b/src/Squidex/app/features/content/shared/content-status.component.html
index 6679161bb..539c10987 100644
--- a/src/Squidex/app/features/content/shared/content-status.component.html
+++ b/src/Squidex/app/features/content/shared/content-status.component.html
@@ -1,11 +1,11 @@
 <ng-container *ngIf="scheduledTo; else noSchedule">
-    <span class="content-status pending mr-1"title="{{tooltipText}}" titlePosition="top">
+    <span class="content-status pending mr-1"title="{{tooltipText}}">
         <i class="icon-clock" [class.icon-sm]="small"></i>
     </span>
 </ng-container>
 
 <ng-template #noSchedule>
-    <span class="content-status default mr-1" [style.color]="statusColor" title="{{tooltipText}}" titlePosition="top">
+    <span class="content-status default mr-1" [style.color]="statusColor" title="{{tooltipText}}">
         <i class="icon-circle" [class.icon-sm]="small"></i>
     </span>
 </ng-template>
diff --git a/src/Squidex/app/shared/components/references-dropdown.component.ts b/src/Squidex/app/shared/components/references-dropdown.component.ts
index ed91da3b5..16dd9b26d 100644
--- a/src/Squidex/app/shared/components/references-dropdown.component.ts
+++ b/src/Squidex/app/shared/components/references-dropdown.component.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnChanges } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import {
@@ -48,7 +48,7 @@ const NO_EMIT = { emitEvent: false };
     providers: [SQX_REFERENCES_DROPDOWN_CONTROL_VALUE_ACCESSOR],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class ReferencesDropdownComponent extends StatefulControlComponent<State, ReadonlyArray<string> | string> implements OnInit {
+export class ReferencesDropdownComponent extends StatefulControlComponent<State, ReadonlyArray<string> | string> implements OnChanges {
     private languageField: LanguageDto;
     private selectedId: string | undefined;
     private itemCount: number;
@@ -59,6 +59,10 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
     @Input()
     public mode: 'Array' | 'Single';
 
+    public get isValid() {
+        return !!this.schemaId && !!this.languageField;
+    }
+
     @Input()
     public set language(value: LanguageDto) {
         this.languageField = value;
@@ -102,8 +106,8 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
                 }));
     }
 
-    public ngOnInit() {
-        if (!this.schemaId || this.language) {
+    public ngOnChanges() {
+        if (!this.isValid) {
             this.selectionControl.disable();
             return;
         }
@@ -121,6 +125,16 @@ export class ReferencesDropdownComponent extends StatefulControlComponent<State,
             });
     }
 
+    public setDisabledState(isDisabled: boolean) {
+        if (isDisabled) {
+            this.selectionControl.disable();
+        } else if (this.isValid) {
+            this.selectionControl.enable();
+        }
+
+        super.setDisabledState(isDisabled);
+    }
+
     public writeValue(obj: any) {
         if (Types.isString(obj)) {
             this.selectedId = obj;
diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts
index 761f65f5d..55316dccc 100644
--- a/src/Squidex/app/shared/components/search-form.component.ts
+++ b/src/Squidex/app/shared/components/search-form.component.ts
@@ -72,9 +72,15 @@ export class SearchFormComponent implements OnChanges {
     public ngOnChanges(changes: SimpleChanges) {
         if (changes['query'] || changes['queries']) {
             this.updateSaveKey();
+        }
 
+        if (changes['query']) {
             this.hasFilter = hasFilter(this.query);
         }
+
+        if (changes['queryModel']) {
+            this.query = {};
+        }
     }
 
     public search(close = false) {