diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml
index 593ca3d3..0e540343 100644
--- a/conf/cmi/language/fi/views.view.unit_search.yml
+++ b/conf/cmi/language/fi/views.view.unit_search.yml
@@ -2,16 +2,20 @@ display:
   default:
     display_options:
       filters:
-        combine:
+        provided_languages_value:
           group_info:
+            group_items:
+              1:
+                title: 'Näytä toimipisteet, joilta saa palvelua ruotsiksi'
+          expose:
             description: ''
-            label: 'Kentät yhdistävä suodatin'
+            placeholder: ''
+        combine:
           expose:
             label: Etsi
-      empty:
-        area:
-          content:
-            value: "<p>Ei tuloksia</p>\r\n"
+          group_info:
+            label: 'Kentät yhdistävä suodatin'
+            description: ''
       exposed_form:
         options:
           submit_button: Käytä
@@ -30,6 +34,19 @@ 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:
@@ -39,4 +56,12 @@ 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 8161ff66..3d3e3bac 100644
--- a/conf/cmi/language/sv/views.view.unit_search.yml
+++ b/conf/cmi/language/sv/views.view.unit_search.yml
@@ -2,6 +2,20 @@ 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
@@ -20,12 +34,15 @@ display:
             items_per_page_label: 'Inlägg per sida'
             items_per_page_options_all_label: '- Alla -'
             offset_label: Kompensera
-      filters:
-        combine:
-          expose:
-            label: Sök
-          group_info:
-            label: 'Kombinera filterfält'
+      fields:
+        name:
+          separator: ', '
+        address__postal_code:
+          separator: ', '
+        address__address_line1:
+          separator: ', '
+        address__address_line2:
+          separator: ', '
       empty:
         area:
           content:
@@ -38,3 +55,11 @@ 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 bc651f33..28905c89 100644
--- a/conf/cmi/views.view.unit_search.yml
+++ b/conf/cmi/views.view.unit_search.yml
@@ -1178,10 +1178,12 @@ 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