From e72551e793174fa1be9241ddb472430403033847 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Mon, 18 Nov 2019 20:18:40 +0100
Subject: [PATCH] Another fix for queries.

---
 frontend/app/shared/state/contents.state.ts | 12 ++++++++++--
 frontend/app/shared/state/schemas.state.ts  |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/app/shared/state/contents.state.ts b/frontend/app/shared/state/contents.state.ts
index e38db3b7e..3f540162e 100644
--- a/frontend/app/shared/state/contents.state.ts
+++ b/frontend/app/shared/state/contents.state.ts
@@ -125,8 +125,16 @@ export abstract class ContentsStateBase extends State<Snapshot> {
     }
 
     public load(isReload = false): Observable<any> {
-        if (this.schemaId !== this.previousId) {
-            this.resetState();
+        if (!isReload) {
+            if (this.schemaId !== this.previousId) {
+                this.resetState();
+            } else {
+                const contentsPager = this.snapshot.contentsPager;
+                const contentsQuery = this.snapshot.contentsQuery;
+                const contentsQueryJson = this.snapshot.contentsQueryJson;
+
+                this.resetState({ contentsPager, contentsQuery, contentsQueryJson });
+            }
         }
 
         return this.loadInternal(isReload);
diff --git a/frontend/app/shared/state/schemas.state.ts b/frontend/app/shared/state/schemas.state.ts
index 0aab1c720..a234a27fc 100644
--- a/frontend/app/shared/state/schemas.state.ts
+++ b/frontend/app/shared/state/schemas.state.ts
@@ -138,7 +138,9 @@ export class SchemasState extends State<Snapshot> {
 
     public load(isReload = false): Observable<any> {
         if (!isReload) {
-            this.resetState({ selectedSchema: this.snapshot.selectedSchema });
+            const selectedSchema = this.snapshot.selectedSchema;
+
+            this.resetState({ selectedSchema });
         }
 
         return this.loadInternal(isReload);