diff --git a/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php b/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php
index 222969211..0402beb3f 100644
--- a/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php
+++ b/sites/all/modules/figli/edlp_search/src/Controller/EdlpSearchController.php
@@ -45,7 +45,6 @@ class EdlpSearchController extends ControllerBase {
     );
   }
 
-
   private function getSearchForm(){
     $this->form = $this->formBuilder->getForm('Drupal\edlp_search\Form\EdlpSearchForm');
   }
@@ -315,7 +314,11 @@ class EdlpSearchController extends ControllerBase {
 
     // Search for keys.
     if (!empty($this->keys)) {
-      $query->keys($this->keys);
+      // $query->keys($this->keys);
+      $keys_condition_group = $query->createConditionGroup('OR');
+      $keys_condition_group->addCondition('title', $this->keys, 'IN');
+      $keys_condition_group->addCondition('field_description', $this->keys, 'IN');
+      $query->addConditionGroup($keys_condition_group);
     }
 
     // langues
diff --git a/sites/all/modules/figli/edlp_search/src/Form/EdlpSearchForm.php b/sites/all/modules/figli/edlp_search/src/Form/EdlpSearchForm.php
index 52c4b16e3..ee655b8ac 100644
--- a/sites/all/modules/figli/edlp_search/src/Form/EdlpSearchForm.php
+++ b/sites/all/modules/figli/edlp_search/src/Form/EdlpSearchForm.php
@@ -29,8 +29,8 @@ class EdlpSearchForm extends FormBase {
       '#title' => $this->t('Search'),
       'keys' => [
         '#type' => 'search',
-        '#autocomplete_route_name' => 'edlp_search.edlp_search_controller_autocomplete',
-        '#autocomplete_route_parameters' => array('field_name' => 'title'),
+        // '#autocomplete_route_name' => 'edlp_search.edlp_search_controller_autocomplete',
+        // '#autocomplete_route_parameters' => array('field_name' => 'title'),
         '#maxlength' => 20,
         '#size' => 15,
         '#weight' => '0',