diff --git a/config/sync/search_api.index.database.yml b/config/sync/search_api.index.database.yml
index b171ef3..7cef308 100644
--- a/config/sync/search_api.index.database.yml
+++ b/config/sync/search_api.index.database.yml
@@ -8,12 +8,12 @@ dependencies:
     - node
     - search_api
   config:
-    - field.storage.node.field_manufacturer
-    - field.storage.taxonomy_term.field_public_address
-    - field.storage.node.field_distributor
-    - field.storage.node.field_famille
-    - field.storage.node.field_reference
     - field.storage.node.body
+    - field.storage.node.field_distributor
+    - field.storage.taxonomy_term.field_public_address
+    - field.storage.node.field_famille
+    - field.storage.node.field_manufacturer
+    - field.storage.node.field_reference
     - field.storage.node.field_tags
     - field.storage.taxonomy_term.field_synonyms
     - field.storage.node.field_thesaurus
@@ -68,7 +68,7 @@ field_settings:
     label: 'Manufacturer » Terme de taxonomie » Address » The two-letter country code'
     datasource_id: 'entity:node'
     property_path: 'field_manufacturer:entity:field_public_address:country_code'
-    type: string
+    type: 'solr_text_custom:edgestring'
     dependencies:
       config:
         - field.storage.node.field_manufacturer
@@ -98,7 +98,7 @@ field_settings:
     label: Reference
     datasource_id: 'entity:node'
     property_path: field_reference
-    type: 'solr_text_custom:ngramstring'
+    type: solr_text_wstoken
     boost: !!float 21
     dependencies:
       config:
@@ -160,8 +160,8 @@ field_settings:
     label: 'Tags » Taxonomy term » Name'
     datasource_id: 'entity:node'
     property_path: 'field_tags:entity:name'
-    type: text
-    boost: !!float 13
+    type: solr_text_wstoken
+    boost: !!float 8
     dependencies:
       config:
         - field.storage.node.field_tags
@@ -171,8 +171,8 @@ field_settings:
     label: 'Tags » Taxonomy term » Synonyms'
     datasource_id: 'entity:node'
     property_path: 'field_tags:entity:field_synonyms'
-    type: text
-    boost: !!float 13
+    type: solr_text_wstoken
+    boost: !!float 8
     dependencies:
       config:
         - field.storage.node.field_tags
@@ -183,8 +183,8 @@ field_settings:
     label: 'Tags » Taxonomy term » Term ID'
     datasource_id: 'entity:node'
     property_path: 'field_tags:entity:tid'
-    type: text
-    boost: !!float 13
+    type: solr_text_wstoken
+    boost: !!float 8
     dependencies:
       config:
         - field.storage.node.field_tags
@@ -194,8 +194,8 @@ field_settings:
     label: 'Thesaurus » Taxonomy term » Name'
     datasource_id: 'entity:node'
     property_path: 'field_thesaurus:entity:name'
-    type: text
-    boost: !!float 13
+    type: solr_text_wstoken
+    boost: !!float 8
     dependencies:
       config:
         - field.storage.node.field_thesaurus
@@ -205,8 +205,8 @@ field_settings:
     label: 'Thesaurus » Taxonomy term » Synonyms'
     datasource_id: 'entity:node'
     property_path: 'field_thesaurus:entity:field_synonyms'
-    type: text
-    boost: !!float 13
+    type: solr_text_wstoken
+    boost: !!float 8
     dependencies:
       config:
         - field.storage.node.field_thesaurus
@@ -217,8 +217,8 @@ field_settings:
     label: 'Thesaurus » Taxonomy term » Term ID'
     datasource_id: 'entity:node'
     property_path: 'field_thesaurus:entity:tid'
-    type: text
-    boost: !!float 21
+    type: solr_text_wstoken
+    boost: !!float 8
     dependencies:
       config:
         - field.storage.node.field_thesaurus
@@ -229,7 +229,7 @@ field_settings:
     datasource_id: 'entity:node'
     property_path: title
     type: text
-    boost: !!float 21
+    boost: !!float 13
     dependencies:
       module:
         - node