diff --git a/atlas/static/css/atlas.css b/atlas/static/css/atlas.css
index 076b6fa1..45131d64 100644
--- a/atlas/static/css/atlas.css
+++ b/atlas/static/css/atlas.css
@@ -170,6 +170,13 @@ a {
   padding-right: 20px;
 }
 
+#searchTaxons,
+#searchCommunes {
+  min-width: 175px;
+  width: 20vw;
+  max-width: 400px;
+}
+
 @media (max-width: 760px) {
   .navbar-collapse {
     background-color: #333;
diff --git a/atlas/static/custom/templates/navbar.html.sample b/atlas/static/custom/templates/navbar.html.sample
index 52f81b9c..1dda9c5c 100644
--- a/atlas/static/custom/templates/navbar.html.sample
+++ b/atlas/static/custom/templates/navbar.html.sample
@@ -1,10 +1,10 @@
 {% block navbar %}
 {% if configuration.MULTILINGUAL %}
-<script type="text/javascript"> 
-    var language = '{{ '/' + g.lang_code }}'; 
+<script type="text/javascript">
+    var language = '{{ '/' + g.lang_code }}';
 </script>
 {% else %}
-<script type="text/javascript"> 
+<script type="text/javascript">
     var language = '' ;
 </script>
 {% endif %}
@@ -31,7 +31,7 @@
                 <form method="POST" action="" id='searchFormTaxons' role="search">
                     <div class="form-group has-feedback">
                         <input id="searchTaxons" type="text" class="form-control mr-sm-2 ajax-search small-placeholder"
-                               placeholder="{{ _('search.species') }}&nbsp;&nbsp;&nbsp;" loading="false" style="width: 175px;"  />
+                               placeholder="{{ _('search.species') }}&nbsp;&nbsp;&nbsp;" loading="false"  />
 
                     </div>
                     <input id="hiddenInputTaxons" type="hidden"name="cd_ref"/>
@@ -42,7 +42,7 @@
                       action=""
                       role="search">
                     <div class="form-group has-feedback">
-                        <input id="searchCommunes" type="text" style="width: 175px;"
+                        <input id="searchCommunes" type="text"
                                class="form-control mr-sm-2 ajax-search small-placeholder"
                                placeholder="{{ _('search.city') }}&nbsp;&nbsp;&nbsp;">
                     </div>
@@ -54,7 +54,7 @@
                     <a class="nav-link dropdown-toggle" id="dropdown09" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <!-- Display languages flags and name, en flag is flag-icon flag-icon-gb-->
                         <container style="display: inline-flex;">
-                            <span class="{{ 'flag-icon ' + configuration.AVAILABLE_LANGUAGES[g.lang_code]['flag_icon']}}" class="align-middle"></span> 
+                            <span class="{{ 'flag-icon ' + configuration.AVAILABLE_LANGUAGES[g.lang_code]['flag_icon']}}" class="align-middle"></span>
                             <div class="d-lg-block d-sm-none">&nbsp;&nbsp;{{ configuration.AVAILABLE_LANGUAGES[g.lang_code]['name'] }}</div>
                         </container>
                     </a>
@@ -62,7 +62,7 @@
                     {% for language in configuration.AVAILABLE_LANGUAGES %}
                         <a  class="dropdown-item" href="{{url_for(request.endpoint, lang_code=language, **request.view_args)}}">
                             <container style="display: inline-flex;">
-                                <span class="{{ 'flag-icon ' + configuration.AVAILABLE_LANGUAGES[language]['flag_icon']}}"> </span> 
+                                <span class="{{ 'flag-icon ' + configuration.AVAILABLE_LANGUAGES[language]['flag_icon']}}"> </span>
                                 <div class="d-lg-block d-sm-none">&nbsp;&nbsp;{{ configuration.AVAILABLE_LANGUAGES[language]['name'] }}</div>
                             </container>
                         </a>
@@ -70,7 +70,7 @@
                     </div>
                 </div>
                 {% endif %}
-                
+
                 {% if configuration.EXTENDED_AREAS %}
                     {% include 'templates/core/extended_areas_search.html' %}
                 {% endif %}
@@ -79,4 +79,4 @@
 
     </nav>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/atlas/static/main.js b/atlas/static/main.js
index 92fb2f89..13135464 100644
--- a/atlas/static/main.js
+++ b/atlas/static/main.js
@@ -57,8 +57,11 @@ autocompleteSearch = function(inputID, urlDestination, nbProposal) {
     focus: function(event, ui) {
       return false;
     },
-    select: function(event, ui) {
-      $(inputID).val(ui.item.label);
+    select: function (event, ui) {
+      let splited_label = ui.item.label.split(' = ');
+      let label_for_input = splited_label[0] != '' ? splited_label[0] : splited_label[1];
+      $(inputID).val(label_for_input.replace(/<[^>]*>?/gm, ''));
+
       var url = ui.item.value;
       if (urlDestination == "espece") {
         location.href = configuration.URL_APPLICATION + language  + "/espece/" + url;