diff --git a/config/language/fi/views.view.service_units.yml b/config/language/fi/views.view.service_units.yml
index dc663eb2..8db65c7c 100644
--- a/config/language/fi/views.view.service_units.yml
+++ b/config/language/fi/views.view.service_units.yml
@@ -1,20 +1,29 @@
 display:
   default:
+    display_title: Oletus
     display_options:
       exposed_form:
         options:
-          submit_button: Apply
+          submit_button: Käytä
           reset_button_label: Palauta
-          exposed_sorts_label: 'Järjestä'
-          sort_asc_label: Nouseva
-          sort_desc_label: Laskeva
+          exposed_sorts_label: Lajittele
+          sort_asc_label: Nousevasti
+          sort_desc_label: Laskevasti
       pager:
         options:
           tags:
-            previous: '‹ Edellinen'
-            next: 'Seuraava ›'
+            previous: 'Edellinen'
+            next: 'Seuraava'
           expose:
-            items_per_page_label: 'Kohteita sivulla'
+            items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
-          views_infinite_scroll:
-            button_text: 'Lataa lisää palvelupaikkoja'
+            offset_label: Offset
+      fields:
+        name:
+          separator: ', '
+      arguments:
+        id:
+          exception:
+            title: Kaikki
+  service_units:
+    display_title: Lohko
diff --git a/config/language/fi/views.view.unit_services.yml b/config/language/fi/views.view.unit_services.yml
index d128c043..96e88a09 100644
--- a/config/language/fi/views.view.unit_services.yml
+++ b/config/language/fi/views.view.unit_services.yml
@@ -1,20 +1,26 @@
 display:
   default:
+    display_title: Oletus
     display_options:
       exposed_form:
         options:
-          submit_button: Apply
+          submit_button: Käytä
           reset_button_label: Palauta
-          exposed_sorts_label: 'Järjestä'
-          sort_asc_label: Nouseva
-          sort_desc_label: Laskeva
+          exposed_sorts_label: Lajittele
+          sort_asc_label: Nousevasti
+          sort_desc_label: Laskevasti
       pager:
         options:
           tags:
-            previous: '‹ Edellinen'
-            next: 'Seuraava ›'
+            previous: 'Edellinen'
+            next: 'Seuraava'
           expose:
-            items_per_page_label: 'Kohteita sivulla'
+            items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
-          views_infinite_scroll:
-            button_text: 'Lataa lisää palveluita'
+            offset_label: Offset
+      arguments:
+        id:
+          exception:
+            title: Kaikki
+  unit_services:
+    display_title: Lohko
diff --git a/config/language/sv/views.view.service_units.yml b/config/language/sv/views.view.service_units.yml
index 3c5cc154..eed534fa 100644
--- a/config/language/sv/views.view.service_units.yml
+++ b/config/language/sv/views.view.service_units.yml
@@ -1,7 +1,29 @@
 display:
   default:
+    display_title: Förvald
     display_options:
+      exposed_form:
+        options:
+          submit_button: Verkställ
+          reset_button_label: Återställ
+          exposed_sorts_label: 'Sortera efter'
+          sort_asc_label: Stigande
+          sort_desc_label: Fallande
       pager:
         options:
-          views_infinite_scroll:
-            button_text: 'Ladda fler serviceställen'
+          tags:
+            previous: 'Föregående'
+            next: 'Nästa'
+          expose:
+            items_per_page_label: 'Inlägg per sida'
+            items_per_page_options_all_label: '- Alla -'
+            offset_label: Kompensera
+      fields:
+        name:
+          separator: ', '
+      arguments:
+        id:
+          exception:
+            title: Alla
+  service_units:
+    display_title: Block
diff --git a/config/language/sv/views.view.unit_services.yml b/config/language/sv/views.view.unit_services.yml
new file mode 100644
index 00000000..4549df30
--- /dev/null
+++ b/config/language/sv/views.view.unit_services.yml
@@ -0,0 +1,26 @@
+display:
+  default:
+    display_title: Förvald
+    display_options:
+      exposed_form:
+        options:
+          submit_button: Verkställ
+          reset_button_label: Återställ
+          exposed_sorts_label: 'Sortera efter'
+          sort_asc_label: Stigande
+          sort_desc_label: Fallande
+      pager:
+        options:
+          tags:
+            previous: 'Föregående'
+            next: 'Nästa'
+          expose:
+            items_per_page_label: 'Inlägg per sida'
+            items_per_page_options_all_label: '- Alla -'
+            offset_label: Kompensera
+      arguments:
+        id:
+          exception:
+            title: Alla
+  unit_services:
+    display_title: Block
diff --git a/config/optional/views.view.service_units.yml b/config/optional/views.view.service_units.yml
index a51e5ce9..af759ce1 100644
--- a/config/optional/views.view.service_units.yml
+++ b/config/optional/views.view.service_units.yml
@@ -1,10 +1,11 @@
 langcode: en
 status: true
 dependencies:
+  config:
+    - core.entity_view_mode.tpr_unit.teaser_with_image
   module:
     - helfi_tpr
     - user
-    - views_infinite_scroll
 id: service_units
 label: 'Service units'
 module: views
@@ -14,76 +15,23 @@ base_table: tpr_unit_field_data
 base_field: id
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: true
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: infinite_scroll
-        options:
-          items_per_page: 8
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          views_infinite_scroll:
-            button_text: 'Load more service points'
-            automatically_load_content: false
-            initially_load_all_pages: false
-      style:
-        type: default
-      row:
-        type: 'entity:tpr_unit'
-        options:
-          relationship: none
-          view_mode: teaser
+      title: ''
       fields:
         name:
+          id: name
           table: tpr_unit_field_data
           field: name
-          id: name
-          entity_type: null
-          entity_field: name
-          plugin_id: field
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: null
+          entity_field: name
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -138,6 +86,123 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 8
+          total_pages: null
+          id: 0
+          tags:
+            next: Next
+            previous: Previous
+            first: First
+            last: Last
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts:
+        name:
+          id: name
+          table: tpr_unit_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_unit
+          entity_field: name
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: name
+          exposed: false
+        name_override:
+          id: name_override
+          table: tpr_unit_field_data
+          field: name_override
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_unit
+          entity_field: name_override
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: name_override
+          exposed: false
+      arguments:
+        id:
+          id: id
+          table: tpr_service_field_data
+          field: id
+          relationship: services_target_id
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_service
+          entity_field: id
+          plugin_id: string
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 1
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: true
+          validate:
+            type: 'entity:tpr_service'
+            fail: 'not found'
+          validate_options:
+            bundles: {  }
+            access: false
+            operation: view
+            multiple: 0
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
       filters:
         content_translation_status:
           id: content_translation_status
@@ -146,6 +211,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: tpr_unit
+          entity_field: content_translation_status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -176,9 +244,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: tpr_unit
-          entity_field: content_translation_status
-          plugin_id: boolean
         langcode:
           id: langcode
           table: tpr_unit_field_data
@@ -186,6 +251,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: tpr_unit
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -218,42 +286,21 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: tpr_unit
-          entity_field: langcode
-          plugin_id: language
-      sorts:
-        name:
-          id: name
-          table: tpr_unit_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: tpr_unit
-          entity_field: name
-          plugin_id: standard
-        name_override:
-          id: name_override
-          table: tpr_unit_field_data
-          field: name_override
+      style:
+        type: default
+      row:
+        type: 'entity:tpr_unit'
+        options:
           relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: tpr_unit
-          entity_field: name_override
-          plugin_id: standard
-      title: ''
-      header: {  }
-      footer: {  }
-      empty: {  }
+          view_mode: teaser_with_image
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: true
+          replica: false
+          query_tags: {  }
       relationships:
         services_target_id:
           id: services_target_id
@@ -262,59 +309,14 @@ display:
           relationship: none
           group_type: group
           admin_label: 'TPR - Service'
-          required: true
           entity_type: tpr_unit
           entity_field: services
           plugin_id: standard
-      arguments:
-        id:
-          id: id
-          table: tpr_service_field_data
-          field: id
-          relationship: services_target_id
-          group_type: group
-          admin_label: ''
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 1
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:tpr_service'
-            fail: 'not found'
-          validate_options:
-            operation: view
-            multiple: 0
-            access: false
-            bundles: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-          entity_type: tpr_service
-          entity_field: id
-          plugin_id: string
-      display_extenders: {  }
+          required: true
       use_ajax: true
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:
@@ -325,13 +327,14 @@ display:
         - user.permissions
       tags: {  }
   service_units:
-    display_plugin: block
     id: service_units
     display_title: Block
+    display_plugin: block
     position: 1
     display_options:
-      display_extenders: { }
       rendering_language: '***LANGUAGE_entity_translation***'
+      display_extenders:
+        metatag_display_extender: {  }
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/config/optional/views.view.unit_services.yml b/config/optional/views.view.unit_services.yml
index 6de7c32b..6b6b485e 100644
--- a/config/optional/views.view.unit_services.yml
+++ b/config/optional/views.view.unit_services.yml
@@ -1,10 +1,11 @@
 langcode: en
 status: true
 dependencies:
+  config:
+    - core.entity_view_mode.tpr_service.teaser
   module:
     - helfi_tpr
     - user
-    - views_infinite_scroll
 id: unit_services
 label: 'Unit services'
 module: views
@@ -14,62 +15,12 @@ base_table: tpr_unit_field_data
 base_field: id
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: true
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: infinite_scroll
-        options:
-          items_per_page: 4
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          views_infinite_scroll:
-            button_text: 'Load more services'
-            automatically_load_content: false
-            initially_load_all_pages: false
-      style:
-        type: default
-      row:
-        type: fields
+      title: ''
       fields:
         rendered_entity:
           id: rendered_entity
@@ -78,6 +29,8 @@ display:
           relationship: services_target_id
           group_type: group
           admin_label: ''
+          entity_type: tpr_service
+          plugin_id: rendered_entity
           label: ''
           exclude: false
           alter:
@@ -120,8 +73,123 @@ display:
           empty_zero: false
           hide_alter_empty: true
           view_mode: teaser
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 4
+          total_pages: null
+          id: 0
+          tags:
+            next: Next
+            previous: Previous
+            first: First
+            last: Last
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts:
+        name:
+          id: name
+          table: tpr_service_field_data
+          field: name
+          relationship: services_target_id
+          group_type: group
+          admin_label: ''
           entity_type: tpr_service
-          plugin_id: rendered_entity
+          entity_field: name
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: name
+          exposed: false
+        name_override:
+          id: name_override
+          table: tpr_service_field_data
+          field: name_override
+          relationship: services_target_id
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_service
+          entity_field: name_override
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: name_override
+          exposed: false
+      arguments:
+        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: string
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: raw
+          default_argument_options:
+            index: 1
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: true
+          validate:
+            type: 'entity:tpr_unit'
+            fail: 'not found'
+          validate_options:
+            bundles: {  }
+            access: false
+            operation: view
+            multiple: 0
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
       filters:
         content_translation_status:
           id: content_translation_status
@@ -130,6 +198,9 @@ display:
           relationship: services_target_id
           group_type: group
           admin_label: ''
+          entity_type: tpr_service
+          entity_field: content_translation_status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -160,9 +231,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: tpr_service
-          entity_field: content_translation_status
-          plugin_id: boolean
         langcode:
           id: langcode
           table: tpr_service_field_data
@@ -170,6 +238,9 @@ display:
           relationship: services_target_id
           group_type: group
           admin_label: ''
+          entity_type: tpr_service
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -202,42 +273,18 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: tpr_service
-          entity_field: langcode
-          plugin_id: language
-      sorts:
-        name:
-          id: name
-          table: tpr_service_field_data
-          field: name
-          relationship: services_target_id
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: tpr_service
-          entity_field: name
-          plugin_id: standard
-        name_override:
-          id: name_override
-          table: tpr_service_field_data
-          field: name_override
-          relationship: services_target_id
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          entity_type: tpr_service
-          entity_field: name_override
-          plugin_id: standard
-      title: ''
-      header: {  }
-      footer: {  }
-      empty: {  }
+      style:
+        type: default
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: true
+          replica: false
+          query_tags: {  }
       relationships:
         services_target_id:
           id: services_target_id
@@ -246,60 +293,15 @@ display:
           relationship: none
           group_type: group
           admin_label: 'TPR - Service'
-          required: true
           entity_type: tpr_unit
           entity_field: services
           plugin_id: standard
-      arguments:
-        id:
-          id: id
-          table: tpr_unit_field_data
-          field: id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 1
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 25
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:tpr_unit'
-            fail: 'not found'
-          validate_options:
-            operation: view
-            multiple: 0
-            access: false
-            bundles: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-          entity_type: tpr_unit
-          entity_field: id
-          plugin_id: string
-      display_extenders: {  }
-      group_by: false
+          required: true
       use_ajax: true
+      group_by: false
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:
@@ -311,13 +313,14 @@ display:
         - 'config:core.entity_view_display.tpr_service.tpr_service.default'
         - 'config:core.entity_view_display.tpr_service.tpr_service.teaser'
   unit_services:
-    display_plugin: block
     id: unit_services
     display_title: Block
+    display_plugin: block
     position: 1
     display_options:
-      display_extenders: { }
       rendering_language: '***LANGUAGE_entity_translation***'
+      display_extenders:
+        metatag_display_extender: {  }
     cache_metadata:
       max-age: -1
       contexts: