diff --git a/composer.lock b/composer.lock
index 9a428e2f..06adef94 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3955,16 +3955,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": {
@@ -3982,23 +3982,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": {
@@ -4100,10 +4100,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",
@@ -9760,25 +9760,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": {
@@ -9807,9 +9807,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",
@@ -15353,16 +15353,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.16.1",
+            "version": "1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
+                "reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
-                "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/d3753fcb3abc6f78f5de6f72153d4b9c99c72dee",
+                "reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee",
                 "shasum": ""
             },
             "require": {
@@ -15392,9 +15392,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.17.1"
             },
-            "time": "2023-02-07T18:11:17+00:00"
+            "time": "2023-04-04T11:11:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
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 28e9a02d..fa174387 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 397aaffe..4cfc7efd 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 5a4eb244..19d7a159 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 694c043c..9df84538 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 3c68da7e..18488495 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 be9a3267..f0d1a92c 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/core.extension.yml b/conf/cmi/core.extension.yml
index f3a321e1..e22ccc75 100644
--- a/conf/cmi/core.extension.yml
+++ b/conf/cmi/core.extension.yml
@@ -52,7 +52,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
@@ -154,6 +153,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 b48408fa..cf65560d 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/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
index 3c5298d7..392b599b 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/filter.format.plain_text.yml b/conf/cmi/filter.format.plain_text.yml
index 8c68abd2..2f205eb2 100644
--- a/conf/cmi/filter.format.plain_text.yml
+++ b/conf/cmi/filter.format.plain_text.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   module:
     - helfi_api_base
+    - helfi_api_base
 name: 'Plain text'
 format: plain_text
 weight: 10
diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml
index 0e540343..593ca3d3 100644
--- a/conf/cmi/language/fi/views.view.unit_search.yml
+++ b/conf/cmi/language/fi/views.view.unit_search.yml
@@ -2,20 +2,16 @@ display:
   default:
     display_options:
       filters:
-        provided_languages_value:
+        combine:
           group_info:
-            group_items:
-              1:
-                title: 'Näytä toimipisteet, joilta saa palvelua ruotsiksi'
-          expose:
             description: ''
-            placeholder: ''
-        combine:
+            label: 'Kentät yhdistävä suodatin'
           expose:
             label: Etsi
-          group_info:
-            label: 'Kentät yhdistävä suodatin'
-            description: ''
+      empty:
+        area:
+          content:
+            value: "<p>Ei tuloksia</p>\r\n"
       exposed_form:
         options:
           submit_button: Käytä
@@ -34,19 +30,6 @@ display:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
             offset_label: Offset
-      fields:
-        name:
-          separator: ', '
-        address__postal_code:
-          separator: ', '
-        address__address_line1:
-          separator: ', '
-        address__address_line2:
-          separator: ', '
-      empty:
-        area:
-          content:
-            value: "<p>Ei tuloksia</p>\r\n"
       arguments:
         id:
           exception:
@@ -56,12 +39,4 @@ display:
     display_title: Lohko
   entity_reference:
     display_title: Entiteettiviittaus
-    display_options:
-      fields:
-        name_override:
-          separator: ', '
-        id:
-          separator: ', '
-        name:
-          separator: ', '
 label: Toimipistehaku
diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml
index 33e1ab99..8161ff66 100644
--- a/conf/cmi/language/sv/views.view.unit_search.yml
+++ b/conf/cmi/language/sv/views.view.unit_search.yml
@@ -1,20 +1,7 @@
 display:
   default:
+    display_title: Förvald
     display_options:
-      filters:
-        provided_languages_value:
-          group_info:
-            group_items:
-              1:
-                title: 'Visa serviceställen som erbjuder service på svenska'
-          expose:
-            description: ''
-            placeholder: ''
-        combine:
-          expose:
-            label: Sök
-          group_info:
-            description: ''
       exposed_form:
         options:
           submit_button: Verkställ
@@ -33,15 +20,12 @@ display:
             items_per_page_label: 'Inlägg per sida'
             items_per_page_options_all_label: '- Alla -'
             offset_label: Kompensera
-      fields:
-        name:
-          separator: ', '
-        address__postal_code:
-          separator: ', '
-        address__address_line1:
-          separator: ', '
-        address__address_line2:
-          separator: ', '
+      filters:
+        combine:
+          expose:
+            label: Sök
+          group_info:
+            label: 'Kombinera filterfält'
       empty:
         area:
           content:
@@ -50,16 +34,7 @@ display:
         id:
           exception:
             title: Alla
-    display_title: Förvald
   block:
     display_title: Block
   entity_reference:
     display_title: Objektsreferens
-    display_options:
-      fields:
-        name_override:
-          separator: ', '
-        id:
-          separator: ', '
-        name:
-          separator: ', '
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
diff --git a/conf/cmi/views.view.tpr_errand_service_list.yml b/conf/cmi/views.view.tpr_errand_service_list.yml
index f9acd751..ca8ac081 100644
--- a/conf/cmi/views.view.tpr_errand_service_list.yml
+++ b/conf/cmi/views.view.tpr_errand_service_list.yml
@@ -7,6 +7,8 @@ dependencies:
     - user
     - helfi_tpr
     - user
+    - helfi_tpr
+    - user
 id: tpr_errand_service_list
 label: 'TPR errand service list'
 module: views
@@ -626,6 +628,7 @@ display:
         groups:
           - AND
           - AND
+          - AND
       style:
         type: table
         options:
@@ -724,6 +727,11 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
   page_1:
     id: page_1
@@ -746,4 +754,9 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
diff --git a/conf/cmi/views.view.tpr_service_channel_list.yml b/conf/cmi/views.view.tpr_service_channel_list.yml
index 7030c627..01913d2d 100644
--- a/conf/cmi/views.view.tpr_service_channel_list.yml
+++ b/conf/cmi/views.view.tpr_service_channel_list.yml
@@ -7,6 +7,8 @@ dependencies:
     - user
     - helfi_tpr
     - user
+    - helfi_tpr
+    - user
 id: tpr_service_channel_list
 label: 'TPR service channel list'
 module: views
@@ -626,6 +628,7 @@ display:
         groups:
           - AND
           - AND
+          - AND
       style:
         type: table
         options:
@@ -724,6 +727,11 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
   page_1:
     id: page_1
@@ -746,4 +754,9 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
diff --git a/conf/cmi/views.view.tpr_service_list.yml b/conf/cmi/views.view.tpr_service_list.yml
index dd0ca009..4a39544b 100644
--- a/conf/cmi/views.view.tpr_service_list.yml
+++ b/conf/cmi/views.view.tpr_service_list.yml
@@ -7,6 +7,8 @@ dependencies:
     - user
     - helfi_tpr
     - user
+    - helfi_tpr
+    - user
 id: tpr_service_list
 label: 'TPR service list'
 module: views
@@ -724,6 +726,11 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
   page_1:
     id: page_1
@@ -747,4 +754,9 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml
index 4595247e..2a0b9d7a 100644
--- a/conf/cmi/views.view.tpr_unit_list.yml
+++ b/conf/cmi/views.view.tpr_unit_list.yml
@@ -13,6 +13,11 @@ dependencies:
     - views_bulk_operations
     - views_bulk_edit
     - content_lock
+    - helfi_tpr
+    - user
+    - views_bulk_operations
+    - views_bulk_edit
+    - content_lock
 id: tpr_unit_list
 label: 'TPR unit list'
 module: views
@@ -138,6 +143,32 @@ display:
               preconfiguration:
                 add_confirmation: false
                 label_override: 'Publish unit'
+            -
+              action_id: 'entity:break_lock:tpr_unit'
+              preconfiguration:
+                add_confirmation: false
+                label_override: 'Break lock'
+            -
+              action_id: 'remote_entity:migration_update:tpr_unit'
+              preconfiguration:
+                add_confirmation: false
+                label_override: Update
+            -
+              action_id: views_bulk_edit
+              preconfiguration:
+                add_confirmation: false
+                label_override: 'Modify values'
+                get_bundles_from_results: true
+            -
+              action_id: 'entity:unpublish_action:tpr_unit'
+              preconfiguration:
+                add_confirmation: false
+                label_override: 'Unpublish unit'
+            -
+              action_id: 'entity:publish_action:tpr_unit'
+              preconfiguration:
+                add_confirmation: false
+                label_override: 'Publish unit'
         id:
           id: id
           table: tpr_unit_field_data
@@ -786,6 +817,11 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
   page_1:
     id: page_1
@@ -809,4 +845,9 @@ display:
         - url
         - url.query_args
         - user.permissions
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
       tags: {  }
diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml
index cc8bee74..51cac5b8 100644
--- a/conf/cmi/views.view.unit_search.yml
+++ b/conf/cmi/views.view.unit_search.yml
@@ -8,6 +8,8 @@ dependencies:
     - address
     - helfi_tpr
     - user
+_core:
+  default_config_hash: mwuTSnSRTePqNG6WFWBI9ajFxnho8CH-6sfyfJnDr0E
 id: unit_search
 label: 'Unit search'
 module: views
@@ -78,7 +80,7 @@ display:
           click_sort_column: value
           type: string
           settings: {  }
-          group_column: entity_id
+          group_column: value
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -142,7 +144,7 @@ display:
           click_sort_column: langcode
           type: address_default
           settings: {  }
-          group_column: entity_id
+          group_column: ''
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -206,7 +208,7 @@ display:
           click_sort_column: langcode
           type: address_default
           settings: {  }
-          group_column: entity_id
+          group_column: ''
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -270,138 +272,7 @@ display:
           click_sort_column: langcode
           type: address_default
           settings: {  }
-          group_column: entity_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        id:
-          id: id
-          table: tpr_unit_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: tpr_unit
-          entity_field: id
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: entity_id
-          group_columns:
-            entity_id: entity_id
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name_1:
-          id: name_1
-          table: taxonomy_term_field_data
-          field: name
-          relationship: field_districts
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: entity_id
+          group_column: ''
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -411,7 +282,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          convert_spaces: false
       pager:
         type: full
         options:
@@ -591,7 +461,6 @@ display:
             address__postal_code: address__postal_code
             address__address_line1: address__address_line1
             address__address_line2: address__address_line2
-            name_1: name_1
         content_translation_status:
           id: content_translation_status
           table: tpr_unit_field_data
@@ -674,143 +543,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-        provided_languages_value:
-          id: provided_languages_value
-          table: tpr_unit__provided_languages
-          field: provided_languages_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: tpr_unit
-          entity_field: provided_languages
-          plugin_id: string
-          operator: '='
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: provided_languages_value_op
-            label: 'Provided languages'
-            description: null
-            use_operator: false
-            operator: provided_languages_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: provided_languages_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: null
-          is_grouped: true
-          group_info:
-            label: ''
-            description: ''
-            identifier: provided_languages_value
-            optional: true
-            widget: select
-            multiple: true
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: 'Show service points that provide service in Swedish'
-                operator: '='
-                value: sv
-        field_districts_target_id:
-          id: field_districts_target_id
-          table: tpr_unit__field_districts
-          field: field_districts_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: empty
-          value: {  }
-          group: 2
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: neighbourhoods
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        langcode_1:
-          id: langcode_1
-          table: taxonomy_term_field_data
-          field: langcode
-          relationship: field_districts
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value:
-            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
-          group: 2
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-          2: OR
       style:
         type: default
         options:
@@ -830,18 +562,8 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
-      relationships:
-        field_districts:
-          id: field_districts
-          table: tpr_unit__field_districts
-          field: field_districts
-          relationship: none
-          group_type: group
-          admin_label: 'field_districts: Taxonomy term'
-          plugin_id: standard
-          required: false
+      relationships: {  }
       use_ajax: true
-      group_by: true
       header: {  }
       footer: {  }
       display_extenders: {  }
@@ -852,7 +574,6 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - user
         - user.permissions
       tags: {  }
   block:
@@ -870,7 +591,6 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - user
         - user.permissions
       tags: {  }
   entity_reference:
@@ -1176,12 +896,10 @@ display:
             id: id
             name_override: name_override
       defaults:
-        relationships: false
         fields: false
         arguments: false
         filters: false
         filter_groups: false
-      relationships: {  }
       display_extenders: {  }
     cache_metadata:
       max-age: -1