diff --git a/composer.lock b/composer.lock
index 857386c0..e3d5ae7b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3991,16 +3991,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "3.0.21",
+            "version": "3.0.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "5a854d585559fad66d74a905a43540e0017bc990"
+                "reference": "55b4496205c61b6d298124b0ade4b43f034ac33a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5a854d585559fad66d74a905a43540e0017bc990",
-                "reference": "5a854d585559fad66d74a905a43540e0017bc990",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/55b4496205c61b6d298124b0ade4b43f034ac33a",
+                "reference": "55b4496205c61b6d298124b0ade4b43f034ac33a",
                 "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.21",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.23",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2023-04-04T08:38:26+00:00"
+            "time": "2023-04-05T06:46:56+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -9770,25 +9770,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": {
@@ -9817,9 +9817,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 f9c8ccf2..26239efa 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
@@ -16,9 +16,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 +122,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
@@ -323,6 +312,7 @@ content:
     third_party_settings: {  }
 hidden:
   created: true
+  field_districts: true
   hide_description: true
   ontologyword_ids: true
   show_www: true
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 67923ae1..d1e976c4 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
@@ -19,7 +19,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
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 e5997f3a..67fd5e97 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
@@ -13,7 +13,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
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 2053eb0a..acb63853 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
@@ -15,7 +15,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
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 221996b7..49971665 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
@@ -16,7 +16,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
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 86b1b878..f616c906 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
@@ -16,7 +16,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
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index 9dc6c5d9..f100eea2 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