diff --git a/docs/api/mapml-viewer-api.mdx b/docs/api/mapml-viewer-api.mdx
index 0c0e331e..4457730c 100644
--- a/docs/api/mapml-viewer-api.mdx
+++ b/docs/api/mapml-viewer-api.mdx
@@ -863,7 +863,7 @@ let output = map.geojson2mapml(json);
 | [**Properties**](#properties) | full | full | full |
 | [**Methods**](#methods) | partial * | full | partial * |
 | [**Interpreting locations and map positions (5.3)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-locations) |  |  |  |
-|           <div class="undecided">[Select map view from street address or place name (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | full | [full](https://maps4html.org/web-map-doc/docs/user-guide/search) | [full](#events) |
+|           <div class="undecided">[Select map view from street address or place name (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | [full](https://maps4html.org/MapML-Specification/spec/#search-events) | [full](https://maps4html.org/web-map-doc/docs/user-guide/search) | [full](#events) |
 
 <details>
 <summary>Exceptions *</summary>
diff --git a/docs/elements/link.md b/docs/elements/link.md
index d612af04..bf062f96 100644
--- a/docs/elements/link.md
+++ b/docs/elements/link.md
@@ -270,7 +270,7 @@ control still works but only returns results on submission.
 |  | Spec | Viewer | API |
 |:---------------------------------------------------------------------------------|:------: |:-----: |:---: |
 | [**Interpreting locations and map positions (5.3)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-locations) |  |  |  |
-|           <div class="undecided">[Select map view from street address or place name (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | full | [full](https://maps4html.org/web-map-doc/docs/user-guide/search) | [full](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
+|           <div class="undecided">[Select map view from street address or place name (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | [full](https://maps4html.org/MapML-Specification/spec/#link-rel-search) | [full](https://maps4html.org/web-map-doc/docs/user-guide/search) | [full](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
 | [**Vector features and overlays (5.2)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-vectors) |  |  |  |
 |                        <div class="requirement">Display map data attribution and links (5.2.4)</div>                   | full | full |  |
 | [**User navigation (pan and zoom) (5.4)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-user-navigation) |  |  |  |
diff --git a/docs/elements/mapml-viewer.md b/docs/elements/mapml-viewer.md
index 1ce6b6dd..5609db61 100644
--- a/docs/elements/mapml-viewer.md
+++ b/docs/elements/mapml-viewer.md
@@ -111,7 +111,7 @@ present. When it is not present or removed, these features are enabled again.
 
 | Specification                                                |
 |--------------------------------------------------------------|
-| [MapML map element](https://maps4html.org/MapML-Specification/spec/#the-mapml-viewer-element-0) |
+| [MapML map element](https://maps4html.org/MapML-Specification/spec/#the-mapviewer-element) |
 | [HTML map element](https://html.spec.whatwg.org/multipage/image-maps.html#the-map-element) |
 
 ---
@@ -135,7 +135,7 @@ present. When it is not present or removed, these features are enabled again.
 |            <div class="requirement">Display map content in a users preferred language (5.1.6)</div>            | [full](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/136) | [full](https://github.com/Maps4HTML/mapml-extension) |  |
 | [**Interpreting locations and map positions (5.3)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-locations) |  |  |  |
 |           <div class="requirement">Select map view from latitude and longitude point (5.3.1)</div>             | full | full | [full](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#zoomtolat-lon-zoom) |
-|           <div class="undecided">[Select map view from street address or place name (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | full | [full](https://maps4html.org/web-map-doc/docs/user-guide/search) | [full](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
+|           <div class="undecided">[Select map view from street address or place name (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | [full](https://maps4html.org/MapML-Specification/spec/#attr-mapviewer-controlslist-search) | [full](https://maps4html.org/web-map-doc/docs/user-guide/search) | [full](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
 |           <div class="undecided">Display map tiles defined in various common coordinate systems (5.3.3)</div>             | [full](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/14) | full | [full](https://maps4html.org/web-map-doc/docs/api/custom-projections) |
 |           <div class="undecided">Reproject map tile data into a new projection or globe view (5.3.4)</div>             | [under discussion](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/3) | none |  |
 |           <div class="undecided">Save the location or export to other application (5.3.5)</div>             | limited | limited |  |
diff --git a/docs/user-guide/search.md b/docs/user-guide/search.md
index edb0ac76..a9aa45c8 100644
--- a/docs/user-guide/search.md
+++ b/docs/user-guide/search.md
@@ -1,6 +1,6 @@
 ---
 id: search
-title: Search
+title: Enabling the Search Control
 slug: /user-guide/search
 ---
 
diff --git a/i18n/fr/docusaurus-plugin-content-docs/current.json b/i18n/fr/docusaurus-plugin-content-docs/current.json
index e7dd1819..6f4bf394 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/current.json
+++ b/i18n/fr/docusaurus-plugin-content-docs/current.json
@@ -23,6 +23,10 @@
     "message": "Les styles",
     "description": "The label for styling in sidebar sidebar"
   },
+  "sidebar.sidebar.category.Search": {
+    "message": "Recherche",
+    "description": "The label for category Search in sidebar sidebar"
+  },
   "sidebar.sidebar.category.Tutorials": {
     "message": "Tutoriels",
     "description": "The label for Tutorials in sidebar sidebar"
diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/api/mapml-viewer-api.mdx b/i18n/fr/docusaurus-plugin-content-docs/current/api/mapml-viewer-api.mdx
index 59982939..35a7f73a 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/current/api/mapml-viewer-api.mdx
+++ b/i18n/fr/docusaurus-plugin-content-docs/current/api/mapml-viewer-api.mdx
@@ -836,7 +836,7 @@ let output = map.geojson2mapml(json);
 | [**Propriétés**](#propriétés) | complet | complet | complet |
 | [**Méthodes**](#méthodes) | limité * | complet | limité * |
 | [**Interpréter les lieux et les positions sur une carte (5.3)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-locations) |  |  |  |
-|           <div class="undecided">[Sélectionner la vue d'une carte à partir d'une adresse ou d'un nom de lieu (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | complet | [complet](https://maps4html.org/web-map-doc/docs/user-guide/search) | [complet](#events) |
+|           <div class="undecided">[Sélectionner la vue d'une carte à partir d'une adresse ou d'un nom de lieu (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | [complet](https://maps4html.org/MapML-Specification/spec/#search-events) | [complet](https://maps4html.org/web-map-doc/docs/user-guide/search) | [complet](#events) |
 
 <details>
 <summary>Exceptions *</summary>
diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/elements/link.md b/i18n/fr/docusaurus-plugin-content-docs/current/elements/link.md
index a81d2833..52dc1d21 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/current/elements/link.md
+++ b/i18n/fr/docusaurus-plugin-content-docs/current/elements/link.md
@@ -237,7 +237,7 @@ contrôle fonctionne toujours mais ne retourne des résultats que lors de la sou
 |  | Spéc. | Visualiseur | API |
 |:---------------------------------------------------------------------------------|:------: |:-----: |:---: |
 | [**Interpréter les lieux et les positions sur une carte (5.3)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-locations) |  |  |  |
-|           <div class="undecided">[Sélectionner la vue d'une carte à partir d'une adresse ou d'un nom de lieu (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | complet | [complet](https://maps4html.org/web-map-doc/docs/user-guide/search) | [complet](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
+|           <div class="undecided">[Sélectionner la vue d'une carte à partir d'une adresse ou d'un nom de lieu (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | [complet](https://maps4html.org/MapML-Specification/spec/#link-rel-search) | [complet](https://maps4html.org/web-map-doc/docs/user-guide/search) | [complet](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
 | [**Entités vectorielles et superpositions (5.2)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-vectors) |  |  |  |
 |                        <div class="requirement">Affiche l’attribution des données cartographiques et les liens (5.2.4)</div>                   | complet | complet |  |
 | [**Navigation des utilisateurs (vue panoramique et zoom) (5.4)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-user-navigation) |  |  |  |
diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/elements/mapml-viewer.md b/i18n/fr/docusaurus-plugin-content-docs/current/elements/mapml-viewer.md
index 0d03a1e4..f9f1e619 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/current/elements/mapml-viewer.md
+++ b/i18n/fr/docusaurus-plugin-content-docs/current/elements/mapml-viewer.md
@@ -110,7 +110,7 @@ carte lorsqu'il est présent. Lorsqu'il n'est pas présent ou qu'il est supprim
 
 | Spécification                                                |
 |--------------------------------------------------------------|
-| [Élément MapML « map »](https://maps4html.org/MapML-Specification/spec/#the-map-element-0) |
+| [Élément MapML « map »](https://maps4html.org/MapML-Specification/spec/#the-mapviewer-element) |
 | [Élément HTML « map »](https://html.spec.whatwg.org/multipage/image-maps.html#the-map-element) |
 
 ---
@@ -134,7 +134,7 @@ carte lorsqu'il est présent. Lorsqu'il n'est pas présent ou qu'il est supprim
 |            <div class="requirement">Afficher le contenu d’une carte dans la langue préférée de l’utilisateur (5.1.6)</div>            | [complet](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/136) | [complet](https://github.com/Maps4HTML/mapml-extension) |  |
 | [**Interpréter les lieux et les positions sur une carte (5.3)**](https://maps4html.org/HTML-Map-Element-UseCases-Requirements/#map-viewers-capabilities-locations) |  |  |  |
 |           <div class="requirement">Sélectionner la vue d'une carte à partir d'un point de latitude et de longitude (5.3.1)</div>             | complet | complet | [complet](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#zoomtolat-lon-zoom) |
-|           <div class="undecided">[Sélectionner la vue d'une carte à partir d'une adresse ou d'un nom de lieu (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | complet | [complet](https://maps4html.org/web-map-doc/docs/user-guide/search) | [complet](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
+|           <div class="undecided">[Sélectionner la vue d'une carte à partir d'une adresse ou d'un nom de lieu (5.3.2)](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/145)</div>             | [complet](https://maps4html.org/MapML-Specification/spec/#attr-mapviewer-controlslist-search) | [complet](https://maps4html.org/web-map-doc/docs/user-guide/search) | [complet](https://maps4html.org/web-map-doc/docs/api/mapml-viewer-api#events) |
 |           <div class="undecided">Afficher les pavés de carte définis dans divers systèmes de coordonnées courants (5.3.3)</div>             | [complet](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/14) | complet | [complet](https://maps4html.org/web-map-doc/docs/api/custom-projections) |
 |           <div class="undecided">Reprojeter les données des pavés de carte dans une nouvelle projection ou dans la vue Globe (5.3.4)</div>             | [en cours de discussion](https://github.com/Maps4HTML/HTML-Map-Element-UseCases-Requirements/issues/3) | aucun |  |
 |           <div class="undecided">Sauvegarder l’emplacement ou l’exporter dans une autre application (5.3.5)</div>             | limité | limité |  |
diff --git a/i18n/fr/docusaurus-plugin-content-docs/current/user-guide/search.md b/i18n/fr/docusaurus-plugin-content-docs/current/user-guide/search.md
index 09d9d03d..8e87118e 100644
--- a/i18n/fr/docusaurus-plugin-content-docs/current/user-guide/search.md
+++ b/i18n/fr/docusaurus-plugin-content-docs/current/user-guide/search.md
@@ -1,6 +1,6 @@
 ---
 id: search
-title: Recherche
+title: Activer le contrôle de recherche
 slug: /user-guide/search
 ---
 
diff --git a/sidebars.js b/sidebars.js
index 7173efb7..8a7b1db7 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -39,7 +39,14 @@ module.exports = {
         'user-guide/quick-start'
       ],
     },
-    'user-guide/search',
+    {
+      type: 'category',
+      label: 'Search',
+      items: [
+        'user-guide/search',
+        'user-guide/custom-handlers'
+      ],
+    },
     {
       'Styling': [
         'user-guide/creating-styles',
@@ -47,8 +54,7 @@ module.exports = {
       ],
       'Tutorials': [
         'user-guide/getting-started',
-        'user-guide/modifying-map',
-        'user-guide/custom-handlers'
+        'user-guide/modifying-map'
       ]
     }
   ],