diff --git a/packages/docusaurus-theme-classic/codeTranslations/fr.json b/packages/docusaurus-theme-classic/codeTranslations/fr.json
index 07ee49822e..4f66fde7f8 100644
--- a/packages/docusaurus-theme-classic/codeTranslations/fr.json
+++ b/packages/docusaurus-theme-classic/codeTranslations/fr.json
@@ -18,7 +18,7 @@
   "theme.SearchPage.existingResultsTitle": "Rechercher des résultats pour \"{query}\"",
   "theme.SearchPage.fetchingNewResults": "Chargement de nouveaux résultats...",
   "theme.SearchPage.inputLabel": "Chercher",
-  "theme.SearchPage.inputPlaceholder": "Tapez vôtre recherche ici",
+  "theme.SearchPage.inputPlaceholder": "Tapez votre recherche ici",
   "theme.SearchPage.noResultsText": "Aucun résultat trouvé",
   "theme.blog.paginator.navAriaLabel": "Pagination de la liste des posts du blog",
   "theme.blog.paginator.newerEntries": "Nouvelles entrées",
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.js b/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.js
index 14579c0978..cd51b2da3d 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.js
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.js
@@ -115,7 +115,12 @@ const SearchVersionSelectList = ({docsSearchVersionsHelpers}) => {
 
 function SearchPage() {
   const {
-    siteConfig: {themeConfig: {algolia: {appId, apiKey, indexName} = {}}} = {},
+    siteConfig: {
+      themeConfig: {
+        algolia: {appId, apiKey, indexName},
+      },
+    },
+    i18n: {currentLocale},
   } = useDocusaurusContext();
   const documentsFoundPlural = useDocumentsFoundPlural();
 
@@ -172,7 +177,7 @@ function SearchPage() {
   const algoliaHelper = algoliaSearchHelper(algoliaClient, indexName, {
     hitsPerPage: 15,
     advancedSyntax: true,
-    disjunctiveFacets: ['docusaurus_tag'],
+    disjunctiveFacets: ['language', 'docusaurus_tag'],
   });
 
   algoliaHelper.on(
@@ -268,6 +273,7 @@ function SearchPage() {
 
   const makeSearch = (page = 0) => {
     algoliaHelper.addDisjunctiveFacetRefinement('docusaurus_tag', 'default');
+    algoliaHelper.addDisjunctiveFacetRefinement('language', currentLocale);
 
     Object.entries(docsSearchVersionsHelpers.searchVersions).forEach(
       ([pluginId, searchVersion]) => {
@@ -425,7 +431,7 @@ function SearchPage() {
                   {breadcrumbs.length > 0 && (
                     <span className={styles.searchResultItemPath}>
                       {breadcrumbs.map((html, index) => (
-                        <>
+                        <React.Fragment key={index}>
                           {index !== 0 && (
                             <span
                               className={styles.searchResultItemPathSeparator}>
@@ -437,7 +443,7 @@ function SearchPage() {
                             // eslint-disable-next-line react/no-danger
                             dangerouslySetInnerHTML={{__html: html}}
                           />
-                        </>
+                        </React.Fragment>
                       ))}
                     </span>
                   )}