diff --git a/composer.lock b/composer.lock
index 3a9a4152..661d6716 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3957,16 +3957,16 @@
         },
         {
             "name": "drupal/helfi_navigation",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git",
-                "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6"
+                "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/e8a7a7e74cd2f77d322c352d0778276df2bd1be6",
-                "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/a01a197d7dcef0dcd10935c41955b69c6d216385",
+                "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385",
                 "shasum": ""
             },
             "require": {
@@ -3984,23 +3984,23 @@
             ],
             "description": "Helfi - Navigation",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.3",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues"
             },
-            "time": "2023-02-17T12:43:22+00:00"
+            "time": "2023-04-04T08:26:28+00:00"
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "3.0.20",
+            "version": "3.0.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "adee6ff048849a42f01f78d539264b6e160482ac"
+                "reference": "20a7e2ad05e3fbb593717a202d7ec1a549a1dfc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/adee6ff048849a42f01f78d539264b6e160482ac",
-                "reference": "adee6ff048849a42f01f78d539264b6e160482ac",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/20a7e2ad05e3fbb593717a202d7ec1a549a1dfc9",
+                "reference": "20a7e2ad05e3fbb593717a202d7ec1a549a1dfc9",
                 "shasum": ""
             },
             "require": {
@@ -4102,10 +4102,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.20",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.22",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2023-04-04T07:00:17+00:00"
+            "time": "2023-04-04T14:34:12+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -9769,25 +9769,25 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -9816,9 +9816,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
             },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
         },
         {
             "name": "psr/log",
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index 89628c8c..f7511cb2 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.tpr_unit.tpr_unit.field_content
-    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
@@ -16,9 +15,8 @@ dependencies:
     - paragraphs
     - path
     - readonly_field_widget
-    - select2
 _core:
-  default_config_hash: YWnRrqJSaeQZEwAqgArp65Mhok9h6tEU1KTO5KzRl80
+  default_config_hash: cotjiL17Qafj5pirtPax237aflvFs_-3pKHSP6wblrg
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -123,16 +121,6 @@ content:
         collapse_edit_all: collapse_edit_all
         duplicate: duplicate
     third_party_settings: {  }
-  field_districts:
-    type: select2_entity_reference
-    weight: 29
-    region: content
-    settings:
-      width: 100%
-      autocomplete: false
-      match_operator: STARTS_WITH
-      match_limit: 10
-    third_party_settings: {  }
   field_lower_content:
     type: paragraphs
     weight: 28
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
index ae4736c6..b569e42b 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - field.field.tpr_unit.tpr_unit.field_content
-    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
@@ -19,7 +18,7 @@ dependencies:
     - telephone
     - text
 _core:
-  default_config_hash: hE7e67UYGx1YHjoKPWu1fY3mmmgMH6cF6P3JK5kWyWs
+  default_config_hash: Zg1dRaAcdqWrYdUQPfrE3NjtAFm507U4rg_8LPIPhWA
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -218,11 +217,11 @@ content:
     region: content
 hidden:
   created: true
-  field_districts: true
   field_unit_type: true
   hide_description: true
   langcode: true
   latitude: true
   longitude: true
+  search_api_excerpt: true
   show_www: true
   streetview_entrance_url: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
index 1acb2873..1350b9db 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_unit.minimal
     - field.field.tpr_unit.tpr_unit.field_content
-    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
@@ -13,7 +12,7 @@ dependencies:
     - address
     - helfi_tpr
 _core:
-  default_config_hash: '-PlL5PW4ox5Omj4LpofJ5LrLgrYahOxcc1Cku386V-o'
+  default_config_hash: CmgZbjhEqqtXajBdd0qdd1pKeF8AlLnIjmX77kO52jk
 id: tpr_unit.tpr_unit.minimal
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -53,7 +52,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
@@ -67,6 +65,7 @@ hidden:
   picture_url: true
   picture_url_override: true
   provided_languages: true
+  search_api_excerpt: true
   service_map_embed: true
   services: true
   show_www: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
index a868eae8..9bc26989 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_unit.teaser
     - field.field.tpr_unit.tpr_unit.field_content
-    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
@@ -15,7 +14,7 @@ dependencies:
     - helfi_tpr
     - imagecache_external
 _core:
-  default_config_hash: CSGZthOWS5PNgCpEcOhdUYSQvJyYAJhDMvhkD2RotHU
+  default_config_hash: E_I6tFu_ojyafS1ARj9pBdic7fwoYSiFD1UOeVO-eEo
 id: tpr_unit.tpr_unit.teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -73,7 +72,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
@@ -85,6 +83,7 @@ hidden:
   opening_hours: true
   phone: true
   provided_languages: true
+  search_api_excerpt: true
   service_map_embed: true
   services: true
   show_www: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
index e13d2f94..f6cfee0a 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_unit.teaser_with_image
     - field.field.tpr_unit.tpr_unit.field_content
-    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
@@ -16,7 +15,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: VNYTo5CntTn6nX5XMd8B4xqHRx0QiKEw4hPFz6MahI8
+  default_config_hash: 4Y6H4T5UpKZSpYZp9BRJvH-cgRpJ9kH2A7-uMC5cioU
 id: tpr_unit.tpr_unit.teaser_with_image
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -74,7 +73,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
@@ -86,6 +84,7 @@ hidden:
   name_override: true
   opening_hours: true
   provided_languages: true
+  search_api_excerpt: true
   service_map_embed: true
   services: true
   show_www: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
index 1fd7f64c..496c54f8 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
@@ -5,7 +5,6 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_unit.wide_teaser
     - field.field.tpr_unit.tpr_unit.field_content
-    - field.field.tpr_unit.tpr_unit.field_districts
     - field.field.tpr_unit.tpr_unit.field_lower_content
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
@@ -16,7 +15,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: FcgNfzTLT58CIquKCO2pxW7C9uzpL7SCZH-9Irm_QT8
+  default_config_hash: fg5HihHWCdwJOdmXVRbiQKj5e9jCOJd4f9lqh0xUZLM
 id: tpr_unit.tpr_unit.wide_teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -89,7 +88,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
@@ -99,6 +97,7 @@ hidden:
   latitude: true
   longitude: true
   provided_languages: true
+  search_api_excerpt: true
   service_map_embed: true
   services: true
   show_www: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
index 6edb20e5..3d8c43c1 100644
--- a/conf/cmi/core.extension.yml
+++ b/conf/cmi/core.extension.yml
@@ -51,7 +51,6 @@ module:
   helfi_media_chart: 0
   helfi_media_map: 0
   helfi_media_remote_video: 0
-  helfi_navigation: 0
   helfi_node_announcement: 0
   helfi_node_landing_page: 0
   helfi_node_page: 0
@@ -151,6 +150,7 @@ module:
   views_bulk_edit: 0
   views_bulk_operations: 0
   views_ui: 0
+  helfi_navigation: 1
   pathauto: 1
   content_translation: 10
   externalauth: 10
diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml
index 6c1b852d..5542804a 100644
--- a/conf/cmi/editor.editor.full_html.yml
+++ b/conf/cmi/editor.editor.full_html.yml
@@ -6,6 +6,8 @@ dependencies:
     - filter.format.full_html
   module:
     - ckeditor
+_core:
+  default_config_hash: mx77BnIuTY8Yrm6IkLsHnEOv6JJrHPMD_kKgjP0DVi4
 format: full_html
 editor: ckeditor
 settings:
diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml
index b9b617d6..77e9910c 100644
--- a/conf/cmi/editor.editor.minimal.yml
+++ b/conf/cmi/editor.editor.minimal.yml
@@ -6,6 +6,8 @@ dependencies:
     - filter.format.minimal
   module:
     - ckeditor
+_core:
+  default_config_hash: UYVamJgeMVQeM3VYumbShc-tGJoYe4RhrXqiL_tJw4c
 format: minimal
 editor: ckeditor
 settings:
diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml
deleted file mode 100644
index 600b62e6..00000000
--- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_districts.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: e75f5889-f587-4cbd-abb6-11b342a82497
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.tpr_unit.field_districts
-  module:
-    - helfi_tpr
-_core:
-  default_config_hash: WsEFQNF3dixVbsvntdPxzsV4Ig0bWaOitwuM93Sg9JY
-id: tpr_unit.tpr_unit.field_districts
-field_name: field_districts
-entity_type: tpr_unit
-bundle: tpr_unit
-label: Districts
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: views
-  handler_settings:
-    view:
-      view_name: neighbourhoods_list
-      display_name: entity_reference_1
-      arguments: {  }
-field_type: entity_reference
diff --git a/conf/cmi/field.storage.tpr_unit.field_districts.yml b/conf/cmi/field.storage.tpr_unit.field_districts.yml
deleted file mode 100644
index bf4bd91f..00000000
--- a/conf/cmi/field.storage.tpr_unit.field_districts.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 3d204e83-d79b-4b64-9177-0fb9044a5f56
-langcode: en
-status: true
-dependencies:
-  module:
-    - helfi_tpr
-    - taxonomy
-_core:
-  default_config_hash: oLZ1fyeES9ZOu_ulj3xCYRfo7VZ17yKyW9rmHoAB58Q
-id: tpr_unit.field_districts
-field_name: field_districts
-entity_type: tpr_unit
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
index 8db7b611..0f0fe4ba 100644
--- a/conf/cmi/filter.format.full_html.yml
+++ b/conf/cmi/filter.format.full_html.yml
@@ -6,6 +6,8 @@ dependencies:
     - editor
     - helfi_api_base
     - linkit
+_core:
+  default_config_hash: nhRyMD2DLIUZvFqqCGT5FZbfF9HUbPbm_B7Uz8-6E_E
 name: HTML
 format: full_html
 weight: 0
@@ -22,7 +24,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* lang dir class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
index 134e23cd..e22e6d72 100644
--- a/conf/cmi/filter.format.minimal.yml
+++ b/conf/cmi/filter.format.minimal.yml
@@ -6,6 +6,8 @@ dependencies:
     - editor
     - helfi_api_base
     - linkit
+_core:
+  default_config_hash: iir5dZUojC1bWTysG1mu4qEgxkT8Le4FLCF6C1hQSoY
 name: Minimal
 format: minimal
 weight: 0
diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_districts.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_districts.yml
deleted file mode 100644
index 07ef95b4..00000000
--- a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_districts.yml
+++ /dev/null
@@ -1 +0,0 @@
-label: Kaupunginosat
diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml
index 419b8e19..53938368 100644
--- a/conf/cmi/views.view.redirect.yml
+++ b/conf/cmi/views.view.redirect.yml
@@ -563,7 +563,6 @@ display:
         operator: AND
         groups:
           - AND
-          - AND
       style:
         type: table
         options:
@@ -649,11 +648,6 @@ display:
         - url
         - url.query_args
         - user.permissions
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
       tags: {  }
       cacheable: false
   page_1:
@@ -672,10 +666,5 @@ display:
         - url
         - url.query_args
         - user.permissions
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
       tags: {  }
       cacheable: false
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index f83a6b92..12e3ddf6 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -10,7 +10,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: o65N5aD4o6raf611I_qEHSWgIW8JO4-b5CLd95oAwcM
+  default_config_hash: XOlpVUQKUlLSivoX2Q_cLITkN9lG3XWYV0xIRbsf_pg
 id: service_list
 label: 'Service list'
 module: views