diff --git a/composer.json b/composer.json
index 00dcbc7..92fb52d 100644
--- a/composer.json
+++ b/composer.json
@@ -167,6 +167,9 @@
             },
             "drupal/flag_lists": {
               "webprofiler ConfigEntityStorageDecorator given https://www.drupal.org/project/flag_lists/issues/3198936": "https://www.drupal.org/files/issues/2021-02-17/entitystorageinterface.patch"
+            },
+            "drupal/address": {
+              "Integrate Address with Search API https://www.drupal.org/project/address/issues/2812659": "https://www.drupal.org/files/issues/2020-11-02/integrate-address-searchapi-2812659-56.patch"
             }
         },
         "drupal-scaffold": {
diff --git a/config/sync/search_api.index.database.yml b/config/sync/search_api.index.database.yml
index 3bc2252..05a458b 100644
--- a/config/sync/search_api.index.database.yml
+++ b/config/sync/search_api.index.database.yml
@@ -7,13 +7,14 @@ dependencies:
     - taxonomy
     - node
     - search_api
+    - address
   config:
-    - 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.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_tags
     - field.storage.taxonomy_term.field_synonyms
     - field.storage.node.field_thesaurus
@@ -68,7 +69,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: 'solr_text_custom:edgestring'
+    type: solr_text_wstoken
     dependencies:
       config:
         - field.storage.node.field_manufacturer
@@ -79,7 +80,7 @@ field_settings:
     label: 'Distributor » Terme de taxonomie » Address » The two-letter country code'
     datasource_id: 'entity:node'
     property_path: 'field_distributor:entity:field_public_address:country_code'
-    type: string
+    type: solr_text_wstoken
     dependencies:
       config:
         - field.storage.node.field_distributor
@@ -265,6 +266,11 @@ datasource_settings:
         - fr
 processor_settings:
   add_url: {  }
+  address_abbreviations_to_full_form:
+    all_fields: false
+    weights:
+      preprocess_index: -20
+      preprocess_query: -20
   aggregated_field: {  }
   content_access:
     weights:
@@ -272,14 +278,17 @@ processor_settings:
   double_quote_workaround:
     all_fields: true
     fields:
+      - country_code
+      - country_code_1
       - field_famille
+      - field_reference
+      - name
+      - name_1
       - processed
       - tag_name
       - tag_synonyms
-      - tag_tid
       - thesaurus_name
       - thesaurus_synonyms
-      - thesaurus_tid
       - title
       - uuid
     replacement: '|9999999998|'