diff --git a/composer.lock b/composer.lock
index 74f5582f..69b99902 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3751,16 +3751,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "5.6.21",
+            "version": "5.6.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "56c2b6798eada5ae07fffc0397ef9c3b44ef26a9"
+                "reference": "d28f8bf7135f1e0e59c4679c977fbafafbe3add5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/56c2b6798eada5ae07fffc0397ef9c3b44ef26a9",
-                "reference": "56c2b6798eada5ae07fffc0397ef9c3b44ef26a9",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d28f8bf7135f1e0e59c4679c977fbafafbe3add5",
+                "reference": "d28f8bf7135f1e0e59c4679c977fbafafbe3add5",
                 "shasum": ""
             },
             "require": {
@@ -3778,10 +3778,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.21",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.22",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2023-10-19T09:48:22+00:00"
+            "time": "2023-10-19T13:07:34+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
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 17f5e145..b648a2df 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,7 +16,6 @@ dependencies:
     - paragraphs
     - path
     - readonly_field_widget
-    - select2
 _core:
   default_config_hash: C2Xc2BwYmiIL9SayNQLxaufcoqA5SLusFthQgnmb10A
 id: tpr_unit.tpr_unit.default
@@ -133,16 +132,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: 29
@@ -417,6 +406,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/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 3d3e3bac..8161ff66 100644
--- a/conf/cmi/language/sv/views.view.unit_search.yml
+++ b/conf/cmi/language/sv/views.view.unit_search.yml
@@ -2,20 +2,6 @@ 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
@@ -34,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:
@@ -55,11 +38,3 @@ display:
     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.unit_search.yml b/conf/cmi/views.view.unit_search.yml
index 28905c89..51cac5b8 100644
--- a/conf/cmi/views.view.unit_search.yml
+++ b/conf/cmi/views.view.unit_search.yml
@@ -80,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
@@ -144,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
@@ -208,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
@@ -272,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
@@ -413,7 +282,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          convert_spaces: false
       pager:
         type: full
         options:
@@ -593,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
@@ -676,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:
@@ -832,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: {  }
@@ -854,7 +574,6 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - user
         - user.permissions
       tags: {  }
   block:
@@ -872,7 +591,6 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-        - user
         - user.permissions
       tags: {  }
   entity_reference:
@@ -1178,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