From 1fa683e2a989714dac89b4171dd21607278cbb6f Mon Sep 17 00:00:00 2001
From: Dominik Iwanek <141320833+dominikiwanekhyland@users.noreply.github.com>
Date: Wed, 11 Feb 2026 18:46:57 +0100
Subject: [PATCH] Fix for ACA upstream (#11642)

---
 .../lib/search/services/base-query-builder.service.spec.ts | 7 ++++---
 .../src/lib/search/services/base-query-builder.service.ts  | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/content-services/src/lib/search/services/base-query-builder.service.spec.ts b/lib/content-services/src/lib/search/services/base-query-builder.service.spec.ts
index a71df6007a..bc90038401 100644
--- a/lib/content-services/src/lib/search/services/base-query-builder.service.spec.ts
+++ b/lib/content-services/src/lib/search/services/base-query-builder.service.spec.ts
@@ -341,13 +341,13 @@ describe('BaseQueryBuilderService', () => {
             );
         });
 
-        it('should update URL params even when query is null', async () => {
+        it('should not update URL params even when query is null', async () => {
             spyOn(router, 'navigate').and.returnValue(Promise.resolve(true));
             service.userQuery = '';
 
             await service.execute();
 
-            expect(router.navigate).toHaveBeenCalled();
+            expect(router.navigate).not.toHaveBeenCalled();
         });
     });
 
@@ -446,11 +446,12 @@ describe('BaseQueryBuilderService', () => {
         it('should call execute when updating configuration', async () => {
             spyOn(router, 'navigate').and.returnValue(Promise.resolve(true));
             spyOn(service.searchApi, 'search').and.returnValue(Promise.resolve({ list: { entries: [] } } as ResultSetPaging));
+            spyOn(service, 'execute')
             service.userQuery = 'test';
 
             service.updateSelectedConfiguration('config-2');
 
-            expect(router.navigate).toHaveBeenCalled();
+            expect(service.execute).toHaveBeenCalled();
         });
     });
 
diff --git a/lib/content-services/src/lib/search/services/base-query-builder.service.ts b/lib/content-services/src/lib/search/services/base-query-builder.service.ts
index ae6b8ed75f..e50d1b2cf0 100644
--- a/lib/content-services/src/lib/search/services/base-query-builder.service.ts
+++ b/lib/content-services/src/lib/search/services/base-query-builder.service.ts
@@ -374,11 +374,11 @@ export abstract class BaseQueryBuilderService {
      */
     async execute(updateQueryParams = true, queryBody?: SearchRequest) {
         try {
-            if (updateQueryParams) {
-                this.updateSearchQueryParams();
-            }
             const query = queryBody ? queryBody : this.buildQuery();
             if (query) {
+                if (updateQueryParams) {
+                    this.updateSearchQueryParams();
+                }
                 const resultSetPaging: ResultSetPaging = await this.searchApi.search(query);
                 this.executed.next(resultSetPaging);
             }