diff --git a/composer.lock b/composer.lock
index 446a2c85f..dcb0823a8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3981,16 +3981,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.4.9",
+            "version": "6.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "478c584e03ee0e978065e34ec9175a9104665bc4"
+                "reference": "68471d79e085f59968b7bae901aa311a344ca640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/478c584e03ee0e978065e34ec9175a9104665bc4",
-                "reference": "478c584e03ee0e978065e34ec9175a9104665bc4",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/68471d79e085f59968b7bae901aa311a344ca640",
+                "reference": "68471d79e085f59968b7bae901aa311a344ca640",
                 "shasum": ""
             },
             "require": {
@@ -4008,10 +4008,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.9",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.10",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-02-09T07:57:08+00:00"
+            "time": "2024-02-09T10:34:28+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -4274,16 +4274,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "4.3.6",
+            "version": "4.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "9c6632b8f485f9bd6f4f0200360df78935ea08d2"
+                "reference": "a6f9a5021369b9734b8a7104c4284a23f44cfdc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9c6632b8f485f9bd6f4f0200360df78935ea08d2",
-                "reference": "9c6632b8f485f9bd6f4f0200360df78935ea08d2",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a6f9a5021369b9734b8a7104c4284a23f44cfdc0",
+                "reference": "a6f9a5021369b9734b8a7104c4284a23f44cfdc0",
                 "shasum": ""
             },
             "require": {
@@ -4330,7 +4330,7 @@
                 "drupal/scheduler": "^1.3",
                 "drupal/search_api": "^1.0",
                 "drupal/select2": "^1.12",
-                "drupal/simple_sitemap": "4.1.7",
+                "drupal/simple_sitemap": "^4.0",
                 "drupal/siteimprove": "^2.0",
                 "drupal/social_media": "^2.0",
                 "drupal/stomp": "^2.0",
@@ -4381,12 +4381,6 @@
                         "[#UHF-7721] Fixed node preview when publication date is not set. (https://www.drupal.org/i/3074373)": "https://www.drupal.org/files/issues/2022-12-20/publication_date_is_required_for_completing_the_form-3074373-11.patch",
                         "[#UHF-9113] Fix PHP 8.2 deprecation issue with PublishedAtOrNowComputed class. (https://www.drupal.org/i/3328575)": "https://www.drupal.org/files/issues/2023-05-31/3328575-5-fix-bux-publicate-date.patch"
                     },
-                    "drupal/social_media": {
-                        "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch"
-                    },
-                    "drupal/simple_sitemap": {
-                        "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/i/3264573)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/55722f695264bbaf6062f46e400e905c761fd5b7/patches/simple_sitemap-3264573-respect-frontpage-configuration.patch"
-                    },
                     "drupal/view_unpublished": {
                         "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch"
                     }
@@ -4397,10 +4391,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.6",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.7",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2024-01-30T07:58:25+00:00"
+            "time": "2024-02-09T10:34:32+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml
index 5f71e0f4a..80834ab2a 100644
--- a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml
+++ b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.paragraph.unit_search.field_search_results_terms
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
+    - field.field.paragraph.unit_search.field_unit_search_meta_desc
     - field.field.paragraph.unit_search.field_unit_search_meta_label
     - field.field.paragraph.unit_search.field_unit_search_meta_placehold
     - field.field.paragraph.unit_search.field_unit_search_title
@@ -22,6 +23,7 @@ third_party_settings:
       children:
         - field_unit_search_meta_label
         - field_unit_search_meta_placehold
+        - field_unit_search_meta_desc
         - field_unit_search_meta_button
         - field_search_results_term
         - field_search_results_terms
@@ -37,7 +39,7 @@ third_party_settings:
         description: ''
         required_fields: true
 _core:
-  default_config_hash: fTziigwM99wtfwA2JFLTaxuwlbPXXLDZHA0WRTm14wU
+  default_config_hash: vbRB18A3JsLF_zwHOAgvihRh5k7hedeENTPhXgJEkJ8
 id: paragraph.unit_search.default
 targetEntityType: paragraph
 bundle: unit_search
@@ -45,7 +47,7 @@ mode: default
 content:
   field_search_results_term:
     type: string_textfield
-    weight: 7
+    weight: 8
     region: content
     settings:
       size: 60
@@ -53,7 +55,7 @@ content:
     third_party_settings: {  }
   field_search_results_terms:
     type: string_textfield
-    weight: 8
+    weight: 9
     region: content
     settings:
       size: 60
@@ -69,12 +71,20 @@ content:
     third_party_settings: {  }
   field_unit_search_meta_button:
     type: string_textfield
-    weight: 6
+    weight: 7
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_unit_search_meta_desc:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_unit_search_meta_label:
     type: string_textfield
     weight: 4
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 f8477dec0..615c01032 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
@@ -21,7 +21,6 @@ dependencies:
     - paragraphs
     - path
     - readonly_field_widget
-    - select2
     - text
 _core:
   default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM
@@ -177,16 +176,6 @@ content:
       sidebar: false
       use_details: true
     third_party_settings: {  }
-  field_ontologyword_details:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
     weight: 30
@@ -384,16 +373,6 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
-  subgroup:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
   toc_enabled:
     type: boolean_checkbox
     weight: 3
@@ -447,7 +426,9 @@ hidden:
   field_categories: true
   field_districts: true
   field_hs_front_page: true
+  field_ontologyword_details: true
   field_study_field: true
   hide_description: true
   ontologyword_ids: true
   show_www: true
+  subgroup: true
diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml
index b3497b177..a291bf23e 100644
--- a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml
+++ b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.paragraph.unit_search.field_search_results_terms
     - field.field.paragraph.unit_search.field_unit_search_description
     - field.field.paragraph.unit_search.field_unit_search_meta_button
+    - field.field.paragraph.unit_search.field_unit_search_meta_desc
     - field.field.paragraph.unit_search.field_unit_search_meta_label
     - field.field.paragraph.unit_search.field_unit_search_meta_placehold
     - field.field.paragraph.unit_search.field_unit_search_title
@@ -15,7 +16,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: S6K1S-j1nrFrLcfBOlDE6kLryR5LWMJb6vY4eDaS_G8
+  default_config_hash: _rIJbTr_x5HmlmN6Fw3EBsKZGvNOyKbQjSaKc1mKNG8
 id: paragraph.unit_search.default
 targetEntityType: paragraph
 bundle: unit_search
@@ -52,6 +53,13 @@ content:
     third_party_settings: {  }
     weight: 5
     region: content
+  field_unit_search_meta_desc:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 8
+    region: content
   field_unit_search_meta_label:
     type: string
     label: hidden
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
index 7f6663f15..e15a1f86b 100644
--- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -17,7 +17,6 @@ dependencies:
     - address
     - entity_reference_revisions
     - helfi_address_search
-    - helfi_kasko_content
     - helfi_tpr
     - imagecache_external
     - link
@@ -140,14 +139,7 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 19
-    region: content
-  field_ontologyword_details:
-    type: tpr_ontologyword_details_formatter
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 28
+    weight: 17
     region: content
   highlights:
     type: tpr_connection
@@ -266,14 +258,7 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 18
-    region: content
-  subgroup:
-    type: tpr_connection
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
+    weight: 16
     region: content
   toc_enabled:
     type: boolean
@@ -316,6 +301,7 @@ hidden:
   field_categories: true
   field_districts: true
   field_hs_front_page: true
+  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true
@@ -323,3 +309,4 @@ hidden:
   search_api_excerpt: true
   show_www: true
   streetview_entrance_url: true
+  subgroup: true
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml b/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml
index 2e282fedd..64a7fe93c 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_search_results_term
     - paragraphs.paragraphs_type.unit_search
 _core:
-  default_config_hash: LYIln-ihFC2Yh8kr21WqReMUtCvxBgGM-sWWecgu-ek
+  default_config_hash: XRHpCh3T9okEVBDCzBVMtmiYlNMiMQB2iYFvkMQuXkI
 id: paragraph.unit_search.field_search_results_term
 field_name: field_search_results_term
 entity_type: paragraph
 bundle: unit_search
-label: 'Search results singular term'
-description: 'Term used on the search results title when there is exactly one result from the search.'
+label: 'Search results title for one result without the number'
+description: 'For example: beach'
 required: false
 translatable: false
 default_value: {  }
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml b/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml
index b654f094f..38dce7e5d 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_search_results_terms
     - paragraphs.paragraphs_type.unit_search
 _core:
-  default_config_hash: lGI7gkF8hsMzbBivCchwiOTEsZ_zse_lLJSeqpleA2c
+  default_config_hash: RXz51vDkOLZTPtXNThDBWaYCId5eFU9080-fzmD5pf4
 id: paragraph.unit_search.field_search_results_terms
 field_name: field_search_results_terms
 entity_type: paragraph
 bundle: unit_search
-label: 'Search results plural term'
-description: 'Term used on the search results title when there is zero or more than one result from the search.'
+label: 'Search results title for multiple results without the number'
+description: 'For example: beaches'
 required: false
 translatable: false
 default_value: {  }
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_description.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_description.yml
index bcb2b1963..ab33110fc 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_description.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_description.yml
@@ -8,13 +8,13 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: 3_9J1wbeFDxBC81WAv5Z06_COJoKsb4GSq0vM7Vw5Cw
+  default_config_hash: ZTGauGBzc-adynSr7Fa8sun-ObVxDXyauVyGkBt3lDQ
 id: paragraph.unit_search.field_unit_search_description
 field_name: field_unit_search_description
 entity_type: paragraph
 bundle: unit_search
-label: Description
-description: ''
+label: 'Search description'
+description: 'For example: You can search for the closest playground by address.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml
index e2543b738..3a378875b 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml
@@ -6,18 +6,16 @@ dependencies:
     - field.storage.paragraph.field_unit_search_meta_button
     - paragraphs.paragraphs_type.unit_search
 _core:
-  default_config_hash: H1p7TFY_4QqV75OgUrXeyKb3anWpkAzSCgw8Qi2LJJo
+  default_config_hash: WMu_pMff9ufbsIcNN5Zvzs4WpVegPk-rKheQ66Bdu9Y
 id: paragraph.unit_search.field_unit_search_meta_button
 field_name: field_unit_search_meta_button
 entity_type: paragraph
 bundle: unit_search
-label: 'Search button'
-description: ''
+label: 'Search button text'
+description: "The button's text is set to 'Search' by default. It is not recommended to change the text."
 required: false
 translatable: false
-default_value:
-  -
-    value: 'Search for units'
+default_value: {  }
 default_value_callback: ''
 settings: {  }
 field_type: string
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml
new file mode 100644
index 000000000..ce363bb03
--- /dev/null
+++ b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml
@@ -0,0 +1,21 @@
+uuid: c171d8c7-610f-42cf-adac-002b64ee7c68
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_unit_search_meta_desc
+    - paragraphs.paragraphs_type.unit_search
+_core:
+  default_config_hash: eO7p_-lmOug7Mm2Rdxt0p-TTT6V2MBBxH9L_YEo-7ZM
+id: paragraph.unit_search.field_unit_search_meta_desc
+field_name: field_unit_search_meta_desc
+entity_type: paragraph
+bundle: unit_search
+label: 'Additional description under the search input'
+description: 'For example: Street name and house number'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml
index ffacbf42d..bbf7fd7ff 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml
@@ -6,18 +6,16 @@ dependencies:
     - field.storage.paragraph.field_unit_search_meta_label
     - paragraphs.paragraphs_type.unit_search
 _core:
-  default_config_hash: 1NqtNfe1hQPTA3NGrsG2WfsBTGOi1ZBT1fphjQcYFRE
+  default_config_hash: _CohHpP7Jn_QVCGv0OEu_fADS_cFoVCJazqqiPhdmr4
 id: paragraph.unit_search.field_unit_search_meta_label
 field_name: field_unit_search_meta_label
 entity_type: paragraph
 bundle: unit_search
 label: 'Search label'
-description: ''
+description: 'For example: Address'
 required: false
 translatable: false
-default_value:
-  -
-    value: 'Search for a unit'
+default_value: {  }
 default_value_callback: ''
 settings: {  }
 field_type: string
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml
index e821630a0..87a5e557f 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml
@@ -6,18 +6,16 @@ dependencies:
     - field.storage.paragraph.field_unit_search_meta_placehold
     - paragraphs.paragraphs_type.unit_search
 _core:
-  default_config_hash: K6i7_W3tb5vOn1zfSi_fxqmEGAV6dhR8y6-Q2XZ_d6k
+  default_config_hash: GrQB9l3hLoUZhQ-FDWoVOX0rTHMExIq0kin0dlxTtVk
 id: paragraph.unit_search.field_unit_search_meta_placehold
 field_name: field_unit_search_meta_placehold
 entity_type: paragraph
 bundle: unit_search
-label: 'Search placeholder'
-description: ''
+label: 'Placeholder text for the search input'
+description: 'For example: Kotikatu 1'
 required: false
 translatable: false
-default_value:
-  -
-    value: 'Enter name, address or postal code'
+default_value: {  }
 default_value_callback: ''
 settings: {  }
 field_type: string
diff --git a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_title.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_title.yml
index 9a393a97e..52294d9c9 100644
--- a/conf/cmi/field.field.paragraph.unit_search.field_unit_search_title.yml
+++ b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_title.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_unit_search_title
     - paragraphs.paragraphs_type.unit_search
 _core:
-  default_config_hash: okAR7MjkhSqE0m20IwKe1xjRydad4TR9u4mva3sJ3T4
+  default_config_hash: sQpUskn9FCVfQsBAjHS47snj5E5RTU_TYqZXqI9ceAs
 id: paragraph.unit_search.field_unit_search_title
 field_name: field_unit_search_title
 entity_type: paragraph
 bundle: unit_search
-label: Title
-description: ''
+label: 'Search title (H2)'
+description: 'For example: Search for beaches'
 required: true
 translatable: false
 default_value: {  }
diff --git a/conf/cmi/field.storage.paragraph.field_unit_search_meta_desc.yml b/conf/cmi/field.storage.paragraph.field_unit_search_meta_desc.yml
new file mode 100644
index 000000000..43fc43b9f
--- /dev/null
+++ b/conf/cmi/field.storage.paragraph.field_unit_search_meta_desc.yml
@@ -0,0 +1,21 @@
+uuid: da08a286-7191-470e-b127-ef7bc71e3e5e
+langcode: en
+status: true
+dependencies:
+  module:
+    - paragraphs
+_core:
+  default_config_hash: XlMW7qI0klw8CFmQQQAKQmT4ahEuhP7LpjYlple286g
+id: paragraph.field_unit_search_meta_desc
+field_name: field_unit_search_meta_desc
+entity_type: paragraph
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_term.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_term.yml
index 2619e57e9..fc1c08f27 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_term.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_term.yml
@@ -1,2 +1,2 @@
-label: 'Hakutulosten yksikkötermi'
-description: 'Termi jota käytetään hakutulosten otsikossa kun tuloksia on tasan yksi.'
+label: 'Hakutulosten otsikko (H3) yhdelle hakutulokselle ilman numeroa'
+description: 'Esim. uimaranta'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_terms.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_terms.yml
index bd828b014..ee4aa4a04 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_terms.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_terms.yml
@@ -1,2 +1,2 @@
-label: 'Hakutulosten monikkotermi'
-description: 'Termi jota käytetään hakutulosten otsikossa kun tuloksia on nolla tai enemmän kuin yksi.'
+label: 'Hakutulosten otsikko (H3) monelle hakutulokselle ilman numeroa'
+description: 'Esim. uimarantaa'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml
index ed08ca71a..1374d4b59 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml
@@ -1 +1,2 @@
-label: Kuvaus
+label: 'Haun kuvausteksti'
+description: 'Esim. Voit etsiä lähintä leikkipuistoa osoitteen mukaan.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml
index 777540d9b..c0b866851 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml
@@ -1,4 +1,2 @@
-label: 'Hakukentän painike'
-default_value:
-  -
-    value: 'Hae toimipisteitä'
+label: 'Suodata painikkeen teksti'
+description: 'Painikkeen tekstiksi tulee oletuksena "Etsi". Suositus on, että tekstiä ei muuteta.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml
new file mode 100644
index 000000000..c6df41798
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_desc.yml
@@ -0,0 +1,2 @@
+label: 'Lisäohjeistus hakukentän alle'
+description: 'Esim. Kadunnimi ja talonumero'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml
index 604b984b6..933d6a94a 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml
@@ -1,4 +1,2 @@
-label: 'Hakukentän otsikko'
-default_value:
-  -
-    value: 'Hae toimipisteitä'
+label: 'Hakukentän otsikko (label)'
+description: 'Esim. Osoite'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml
index 3c456672b..0f61917f2 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml
@@ -1,4 +1,2 @@
-label: 'Hakukentän oletusteksti'
-default_value:
-  -
-    value: 'Syötä nimi, osoite tai postinumero'
+label: 'Esimerkkiteksti hakukenttään (placeholder)'
+description: 'Esim. Kotikatu 1'
diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml
index f02d75162..10ee6c746 100644
--- a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml
@@ -1 +1,2 @@
-label: Otsikko
+label: 'Haun otsikko (H2)'
+description: 'Esim. Etsi uimarantoja'
diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml
index b07cb786b..502b2cd82 100644
--- a/conf/cmi/language/fi/views.view.unit_search.yml
+++ b/conf/cmi/language/fi/views.view.unit_search.yml
@@ -20,7 +20,7 @@ display:
             items_per_page_options_all_label: '- Kaikki -'
       exposed_form:
         options:
-          submit_button: Käytä
+          submit_button: Etsi
           reset_button_label: Palauta
           exposed_sorts_label: Järjestä
           sort_asc_label: Nouseva
diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml
index 45893182c..3f96d4bd2 100644
--- a/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml
@@ -1 +1,2 @@
-label: Beskrivning
+label: 'Sök beskrivning'
+description: 'T.ex. Du kan söka efter närmaste lekplats efter adress.'
diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml
index 2711e04da..f577e293f 100644
--- a/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml
@@ -1 +1,2 @@
-label: Titel
+label: 'Sök titel'
+description: 'T.ex. Sök badstränder'
diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml
index 7c64fcf1b..bacb58755 100644
--- a/conf/cmi/language/sv/views.view.unit_search.yml
+++ b/conf/cmi/language/sv/views.view.unit_search.yml
@@ -15,7 +15,7 @@ display:
             offset_label: Kompensera
       exposed_form:
         options:
-          submit_button: Verkställ
+          submit_button: Sök
           reset_button_label: Återställ
           exposed_sorts_label: 'Sortera efter'
           sort_asc_label: Stigande
diff --git a/conf/cmi/simple_sitemap.custom_links.default.yml b/conf/cmi/simple_sitemap.custom_links.default.yml
new file mode 100644
index 000000000..7d9aed84b
--- /dev/null
+++ b/conf/cmi/simple_sitemap.custom_links.default.yml
@@ -0,0 +1,5 @@
+links:
+  -
+    path: /
+    priority: '1.0'
+    changefreq: daily
diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml
index b612e0b1d..3af7c1047 100644
--- a/conf/cmi/views.view.unit_search.yml
+++ b/conf/cmi/views.view.unit_search.yml
@@ -9,7 +9,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: ZOL0VqvCXKFaREHh2rFnw6mN3ARppYjYffpxmhnBVyk
+  default_config_hash: Oj0leJWBcfxnvT-1h1NPQGcFzPrh6dk0zg3c6X43OeQ
 id: unit_search
 label: 'Unit search'
 module: views
@@ -306,7 +306,7 @@ display:
       exposed_form:
         type: basic
         options:
-          submit_button: Use
+          submit_button: Search
           reset_button: false
           reset_button_label: Reset
           exposed_sorts_label: Sort