diff --git a/modules/helfi_node_page/config/install/language/sv/field.field.node.page.field_lower_content.yml b/modules/helfi_node_page/config/install/language/sv/field.field.node.page.field_lower_content.yml
index 9f2d37d3f..e30ea4fb3 100644
--- a/modules/helfi_node_page/config/install/language/sv/field.field.node.page.field_lower_content.yml
+++ b/modules/helfi_node_page/config/install/language/sv/field.field.node.page.field_lower_content.yml
@@ -1 +1 @@
-label: 'Botteninnehåll'
+label: Botteninnehåll
diff --git a/modules/helfi_tpr_config/config/install/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/modules/helfi_tpr_config/config/install/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index f9caab765..d9f377156 100644
--- a/modules/helfi_tpr_config/config/install/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/modules/helfi_tpr_config/config/install/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -3,7 +3,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
@@ -120,16 +119,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/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.default.yml
index 483fb258e..455adc48b 100644
--- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.default.yml
+++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -3,10 +3,10 @@ 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
+    - responsive_image.styles.image__3_2
   module:
     - address
     - entity_reference_revisions
@@ -214,7 +214,6 @@ content:
     region: content
 hidden:
   created: true
-  field_districts: true
   field_unit_type: true
   hide_description: true
   langcode: true
diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
index d975412cc..bd3087949 100644
--- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
+++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml
@@ -49,7 +49,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
index dc1bc950a..1206aabef 100644
--- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
+++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml
@@ -4,10 +4,10 @@ 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
+    - responsive_image.styles.image__3_2
   module:
     - address
     - helfi_tpr
@@ -69,7 +69,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
index 07ed02a87..6371da9d5 100644
--- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
+++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml
@@ -4,10 +4,10 @@ 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
+    - responsive_image.styles.image__3_2
   module:
     - address
     - helfi_tpr
@@ -70,7 +70,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
index 2dc9ae313..43c4b4d1b 100644
--- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
+++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml
@@ -4,10 +4,10 @@ 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
+    - responsive_image.styles.image__3_2
   module:
     - address
     - helfi_tpr
@@ -85,7 +85,6 @@ hidden:
   description: true
   email: true
   field_content: true
-  field_districts: true
   field_lower_content: true
   field_metatags: true
   field_unit_type: true
diff --git a/modules/helfi_tpr_config/config/install/field.field.tpr_unit.tpr_unit.field_districts.yml b/modules/helfi_tpr_config/config/install/field.field.tpr_unit.tpr_unit.field_districts.yml
deleted file mode 100644
index 601841ce6..000000000
--- a/modules/helfi_tpr_config/config/install/field.field.tpr_unit.tpr_unit.field_districts.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.tpr_unit.field_districts
-  module:
-    - helfi_tpr
-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/modules/helfi_tpr_config/config/install/field.storage.tpr_unit.field_districts.yml b/modules/helfi_tpr_config/config/install/field.storage.tpr_unit.field_districts.yml
deleted file mode 100644
index 1c87857e2..000000000
--- a/modules/helfi_tpr_config/config/install/field.storage.tpr_unit.field_districts.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - helfi_tpr
-    - taxonomy
-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/modules/helfi_tpr_config/config/install/language/fi/field.field.tpr_unit.tpr_unit.field_districts.yml b/modules/helfi_tpr_config/config/install/language/fi/field.field.tpr_unit.tpr_unit.field_districts.yml
deleted file mode 100644
index 07ef95b4a..000000000
--- a/modules/helfi_tpr_config/config/install/language/fi/field.field.tpr_unit.tpr_unit.field_districts.yml
+++ /dev/null
@@ -1 +0,0 @@
-label: Kaupunginosat
diff --git a/modules/helfi_tpr_config/config/install/views.view.service_list.yml b/modules/helfi_tpr_config/config/install/views.view.service_list.yml
index 9a7ad7243..f07389da6 100644
--- a/modules/helfi_tpr_config/config/install/views.view.service_list.yml
+++ b/modules/helfi_tpr_config/config/install/views.view.service_list.yml
@@ -3,8 +3,10 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.tpr_service.teaser
+    - core.entity_view_mode.tpr_service.teaser_search_result
   module:
     - helfi_tpr
+    - text
     - user
 id: service_list
 label: 'Service list'
diff --git a/modules/helfi_tpr_config/config/rewrite/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/rewrite/views.view.tpr_errand_service_list.yml
index 402e130ac..3e2d178a4 100644
--- a/modules/helfi_tpr_config/config/rewrite/views.view.tpr_errand_service_list.yml
+++ b/modules/helfi_tpr_config/config/rewrite/views.view.tpr_errand_service_list.yml
@@ -620,7 +620,7 @@ display:
       filter_groups:
         operator: AND
         groups:
-          1: AND
+          - AND
       style:
         type: table
         options:
diff --git a/modules/helfi_tpr_config/config/rewrite/views.view.tpr_service_channel_list.yml b/modules/helfi_tpr_config/config/rewrite/views.view.tpr_service_channel_list.yml
index 47e724fca..01daff3ce 100644
--- a/modules/helfi_tpr_config/config/rewrite/views.view.tpr_service_channel_list.yml
+++ b/modules/helfi_tpr_config/config/rewrite/views.view.tpr_service_channel_list.yml
@@ -620,7 +620,7 @@ display:
       filter_groups:
         operator: AND
         groups:
-          1: AND
+          - AND
       style:
         type: table
         options:
diff --git a/modules/helfi_tpr_config/config/rewrite/views.view.tpr_unit_list.yml b/modules/helfi_tpr_config/config/rewrite/views.view.tpr_unit_list.yml
index 307185195..404a4180a 100644
--- a/modules/helfi_tpr_config/config/rewrite/views.view.tpr_unit_list.yml
+++ b/modules/helfi_tpr_config/config/rewrite/views.view.tpr_unit_list.yml
@@ -80,28 +80,28 @@ display:
           clear_on_exposed: true
           force_selection_info: false
           selected_actions:
-            0:
+            -
               action_id: 'entity:break_lock:tpr_unit'
               preconfiguration:
                 add_confirmation: false
                 label_override: 'Break lock'
-            1:
+            -
               action_id: 'remote_entity:migration_update:tpr_unit'
               preconfiguration:
                 add_confirmation: false
                 label_override: Update
-            2:
+            -
               action_id: views_bulk_edit
               preconfiguration:
                 add_confirmation: false
                 label_override: 'Modify values'
                 get_bundles_from_results: true
-            4:
+            -
               action_id: 'entity:unpublish_action:tpr_unit'
               preconfiguration:
                 add_confirmation: false
                 label_override: 'Unpublish unit'
-            5:
+            -
               action_id: 'entity:publish_action:tpr_unit'
               preconfiguration:
                 add_confirmation: false
diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install
index 6cae87566..51ed97a0a 100644
--- a/modules/helfi_tpr_config/helfi_tpr_config.install
+++ b/modules/helfi_tpr_config/helfi_tpr_config.install
@@ -185,3 +185,11 @@ function helfi_tpr_config_update_9035(): void {
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_tpr_config');
 }
+
+/**
+ * Remove SOTE specific configuration. Double-check configuration updates.
+ */
+function helfi_tpr_config_update_9036(): void {
+  \Drupal::service('helfi_platform_config.config_update_helper')
+    ->update('helfi_tpr_config');
+}