diff --git a/phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php
index 192d3163b5..61c4bd11f6 100644
--- a/phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php
+++ b/phpmyfaq/src/phpMyFAQ/Helper/SearchHelper.php
@@ -102,7 +102,7 @@ public function renderInstantResponseResult(SearchResultSet $resultSet): string
 
                 // Build the link to the faq record
                 $currentUrl = sprintf(
-                    '%sindex.php?%saction=faq&cat=%d&id=%d&artlang=%s&highlight=%s',
+                    '%s?%saction=faq&cat=%d&id=%d&artlang=%s&highlight=%s',
                     $this->config->getDefaultUrl() . 'index.php',
                     $this->sessionId,
                     $result->category_id,
diff --git a/phpmyfaq/src/phpMyFAQ/Search/Elasticsearch.php b/phpmyfaq/src/phpMyFAQ/Search/Elasticsearch.php
index 852fe3542b..9afab6a2c0 100644
--- a/phpmyfaq/src/phpMyFAQ/Search/Elasticsearch.php
+++ b/phpmyfaq/src/phpMyFAQ/Search/Elasticsearch.php
@@ -151,6 +151,8 @@ public function setCategoryIds(array $categoryIds): void
      */
     public function autoComplete(string $searchTerm): array
     {
+        $this->resultSet = [];
+
         $searchParams = [
             'index' => $this->esConfig['index'],
             'size' => 100,