diff --git a/conf/cmi/language/fi/views.view.health_station_search.yml b/conf/cmi/language/fi/views.view.health_station_search.yml
index 4ea17e0f..978d32e8 100644
--- a/conf/cmi/language/fi/views.view.health_station_search.yml
+++ b/conf/cmi/language/fi/views.view.health_station_search.yml
@@ -31,7 +31,8 @@ display:
         combine:
           expose:
             label: 'Terveysasemien haku'
-            placeholder: 'Syötä tähän kaupunginosa tai terveysaseman nimi'
+            description: "Kirjoita terveysaseman nimi tai osoite"
+            placeholder: 'Esim. Haagan terveysasema'
         provided_languages_value:
           expose:
             label: 'Saatavissa olevat kielet'
diff --git a/conf/cmi/language/sv/views.view.health_station_search.yml b/conf/cmi/language/sv/views.view.health_station_search.yml
index c321e44e..c4960e16 100644
--- a/conf/cmi/language/sv/views.view.health_station_search.yml
+++ b/conf/cmi/language/sv/views.view.health_station_search.yml
@@ -28,7 +28,8 @@ display:
         combine:
           expose:
             label: 'Sök hälsostationer'
-            placeholder: 'Skriv in stadsdelen eller namnet på hälsostationen här'
+            description: "Ange hälsostationens namn eller adress"
+            placeholder: 'T.ex. Haga hälsostation'
         provided_languages_value:
           expose:
             label: 'Tillhandahållna språk'
diff --git a/conf/cmi/views.view.health_station_search.yml b/conf/cmi/views.view.health_station_search.yml
index 966fed47..bd5e04b6 100644
--- a/conf/cmi/views.view.health_station_search.yml
+++ b/conf/cmi/views.view.health_station_search.yml
@@ -4,11 +4,9 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.tpr_unit.teaser_with_image
-    - taxonomy.vocabulary.neighbourhoods
   module:
     - address
     - helfi_tpr
-    - taxonomy
 id: health_station_search
 label: 'Health station search'
 module: views
@@ -89,18 +87,18 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        address__address_line1:
-          id: address__address_line1
+        name_override:
+          id: name_override
           table: tpr_unit_field_data
-          field: address__address_line1
+          field: name_override
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: tpr_unit
-          entity_field: address
+          entity_field: name_override
           plugin_id: field
           label: ''
-          exclude: true
+          exclude: false
           alter:
             alter_text: false
             text: ''
@@ -140,9 +138,10 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: langcode
-          type: address_default
-          settings: {  }
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
           group_column: entity_id
           group_columns: {  }
           group_rows: true
@@ -153,10 +152,10 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        address__address_line2:
-          id: address__address_line2
+        address__address_line1:
+          id: address__address_line1
           table: tpr_unit_field_data
-          field: address__address_line2
+          field: address__address_line1
           relationship: none
           group_type: group
           admin_label: ''
@@ -217,10 +216,10 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        address__postal_code:
-          id: address__postal_code
+        address__address_line2:
+          id: address__address_line2
           table: tpr_unit_field_data
-          field: address__postal_code
+          field: address__address_line2
           relationship: none
           group_type: group
           admin_label: ''
@@ -281,15 +280,15 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        id:
-          id: id
+        address__postal_code:
+          id: address__postal_code
           table: tpr_unit_field_data
-          field: id
+          field: address__postal_code
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: tpr_unit
-          entity_field: id
+          entity_field: address
           plugin_id: field
           label: ''
           exclude: true
@@ -332,13 +331,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
+          click_sort_column: langcode
+          type: address_default
+          settings: {  }
           group_column: entity_id
-          group_columns:
-            entity_id: entity_id
+          group_columns: {  }
           group_rows: true
           delta_limit: 0
           delta_offset: 0
@@ -347,16 +344,16 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        name_1:
-          id: name_1
-          table: taxonomy_term_field_data
-          field: name
-          relationship: field_districts
+        id:
+          id: id
+          table: tpr_unit_field_data
+          field: id
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
+          entity_type: tpr_unit
+          entity_field: id
+          plugin_id: field
           label: ''
           exclude: true
           alter:
@@ -403,7 +400,8 @@ display:
           settings:
             link_to_entity: false
           group_column: entity_id
-          group_columns: {  }
+          group_columns:
+            entity_id: entity_id
           group_rows: true
           delta_limit: 0
           delta_offset: 0
@@ -412,7 +410,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          convert_spaces: false
       pager:
         type: full
         options:
@@ -513,7 +510,7 @@ display:
           expose:
             operator_id: combine_op
             label: 'Health station search'
-            description: ''
+            description: "Enter the health station's name or address"
             use_operator: false
             operator: combine_op
             operator_limit_selection: false
@@ -529,9 +526,9 @@ display:
               content_producer: '0'
               editor: '0'
               admin: '0'
-              debug_api: '0'
               super_administrator: '0'
-            placeholder: "Enter the city district or the health station's name here"
+              survey_editor: '0'
+            placeholder: 'For example, Haaga Health Station'
           is_grouped: false
           group_info:
             label: ''
@@ -546,10 +543,10 @@ display:
             group_items: {  }
           fields:
             name: name
+            name_override: name_override
             address__address_line1: address__address_line1
             address__address_line2: address__address_line2
             address__postal_code: address__postal_code
-            name_1: name_1
         content_translation_status:
           id: content_translation_status
           table: tpr_unit_field_data
@@ -757,98 +754,10 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-        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:
@@ -880,15 +789,6 @@ display:
           entity_field: services
           plugin_id: standard
           required: true
-        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
       group_by: true
       header: {  }
       footer: {  }