Maintain old behaviour of the underlying query

Author: ipf

Classes/Controller/SearchController.php

@@ -60,13 +60,15 @@ public function detailAction(string $id): ResponseInterface
                 $arguments
             );
 
-            $this->assetCollector->addInlineJavaScript('underlyingQueryVar', $underlyingQueryScriptTagContent, ['type' => 'text/javascript'], ['priority' => true]);
+            $this->assetCollector->addInlineJavaScript('underlyingQueryVar', sprintf('const underlyingQuery = %s;', $underlyingQueryScriptTagContent), ['type' => 'text/javascript'], ['priority' => true]);
+
         }
 
         $this->addStandardAssignments();
 
         $this->view->assignMultiple($detail);
         $this->view->assignMultiple([
+            'underlyingQuery' => $underlyingQueryScriptTagContent,
             'arguments' => $arguments,
             'config' => $this->searchProvider->getConfiguration(),
         ]);
@@ -92,7 +94,7 @@ public function indexAction(): ResponseInterface
             $this->searchProvider->getRequestArguments()
         );
 
-        $this->assetCollector->addInlineJavaScript('underlyingQueryVar', $underlyingQueryScriptTagContent, ['type' => 'text/javascript'], ['priority' => true]);
+        $this->assetCollector->addInlineJavaScript('underlyingQueryVar', sprintf('const underlyingQuery = %s;', $underlyingQueryScriptTagContent), ['type' => 'text/javascript'], ['priority' => true]);
 
         $this->addStandardAssignments();
         $defaultQuery = $this->searchProvider->getDefaultQuery();

Classes/Utility/FrontendUtility.php

@@ -74,7 +74,7 @@ public static function addQueryInformationAsJavaScript(
                 $underlyingQuery['sort'] = $arguments['sort'];
             }
 
-            return 'const underlyingQuery = ' . json_encode($underlyingQuery, JSON_THROW_ON_ERROR) . ';';
+            return json_encode($underlyingQuery, JSON_THROW_ON_ERROR);
         }
 
         return '';