diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
index fd6cf8f999..3b358414de 100755
--- a/phpmyfaq/index.php
+++ b/phpmyfaq/index.php
@@ -549,7 +549,7 @@
     'dir' => $PMF_LANG['dir'],
     'writeSendAdress' => '?' . $sids . 'action=search',
     'searchBox' => $PMF_LANG['msgSearch'],
-    'searchTerm' => Strings::htmlspecialchars($searchTerm),
+    'searchTerm' => Strings::htmlspecialchars($searchTerm, ENT_QUOTES),
     'categoryId' => ($cat === 0) ? '%' : (int)$cat,
     'headerCategories' => $PMF_LANG['msgFullCategories'],
     'msgCategory' => $PMF_LANG['msgCategory'],
diff --git a/phpmyfaq/search.php b/phpmyfaq/search.php
index 84632735dc..81fe436779 100755
--- a/phpmyfaq/search.php
+++ b/phpmyfaq/search.php
@@ -286,7 +286,7 @@
         'searchBoxSection',
         [
             'writeSendAdress' => '?' . $sids . 'action=search',
-            'searchString' => Strings::htmlspecialchars($inputSearchTerm, ENT_QUOTES, 'utf-8'),
+            'searchString' => Strings::htmlspecialchars($inputSearchTerm, ENT_QUOTES),
             'searchOnAllLanguages' => $PMF_LANG['msgSearchOnAllLanguages'],
             'checkedAllLanguages' => $allLanguages ? ' checked' : '',
             'selectCategories' => $PMF_LANG['msgSelectCategories'],
diff --git a/phpmyfaq/src/phpMyFAQ/Strings.php b/phpmyfaq/src/phpMyFAQ/Strings.php
index 53622542c7..dde749e294 100644
--- a/phpmyfaq/src/phpMyFAQ/Strings.php
+++ b/phpmyfaq/src/phpMyFAQ/Strings.php
@@ -305,9 +305,9 @@ public static function htmlspecialchars(
      */
     public static function htmlentities(
         string $string,
-        $quoteStyle = ENT_HTML5,
-        $charset = 'utf-8',
-        $doubleEncode = true
+        int $quoteStyle = ENT_HTML5,
+        string $charset = 'utf-8',
+        bool $doubleEncode = false
     ): string
     {
         return htmlentities(