diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--after-school-activity-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--after-school-activity-search.html.twig
index 6e446c3c..8f8b3608 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--after-school-activity-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--after-school-activity-search.html.twig
@@ -49,12 +49,13 @@
   {{ attachment_before }}
 
   <div class="unit-search__results">
-     {% if total_rows %}
-      <span class="unit-search__count-container">
-        <span class="unit-search__count">{{ total_rows }}</span>
-        {% trans with {'context': 'After-school activity search count'}%}location{% plural total_rows %}locations{% endtrans %}
-      </span>
-    {% endif %}
+    <h3 class="unit-search__count-container">
+      {%- if total_rows -%}
+        {{ total_rows }} {% trans with {'context': 'After-school activity search count'}%}activity location{% plural total_rows %}activity locations{% endtrans %}
+      {%- else -%}
+        {{ 'No results'|t({}, {'context' : 'Unit search no results title'}) }}
+      {%- endif -%}
+    </h3>
 
     {% if header %}
       {{ header }}
@@ -62,7 +63,10 @@
 
     {{ rows }}
 
-    {{ empty }}
+    {%- if empty -%}
+      <p>{{ 'No results were found for the criteria you entered. Try changing your search criteria.'|t({}, {'context' : 'Unit search no results text'}) }}</p>
+    {%- endif -%}
+
     {{ pager }}
   </div>
 
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--comprehensive-school-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--comprehensive-school-search.html.twig
index 71a1731c..96313c33 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--comprehensive-school-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--comprehensive-school-search.html.twig
@@ -49,10 +49,13 @@
   {{ attachment_before }}
 
   <div class="unit-search__results">
-    <span class="unit-search__count-container">
-      <span class="unit-search__count">{{ total_rows }}</span>
-      {% trans with {'context': 'Comprehensive school search count'}%}school{% plural total_rows %}schools{% endtrans %}
-    </span>
+    <h3 class="unit-search__count-container">
+      {%- if total_rows -%}
+        {{ total_rows }} {% trans with {'context': 'Comprehensive school search count'}%}school{% plural total_rows %}schools{% endtrans %}
+      {%- else -%}
+        {{ 'No results'|t({}, {'context' : 'Unit search no results title'}) }}
+      {%- endif -%}
+    </h3>
 
     {% if header %}
       {{ header }}
@@ -60,7 +63,9 @@
 
     {{ rows }}
 
-    {{ empty }}
+    {%- if empty -%}
+      <p>{{ 'No results were found for the criteria you entered. Try changing your search criteria.'|t({}, {'context' : 'Unit search no results text'}) }}</p>
+    {%- endif -%}
     {{ pager }}
   </div>
 
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
index 611d9f9d..c96ec61e 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
@@ -49,18 +49,24 @@
   {{ attachment_before }}
 
   <div class="unit-search__results" data-id-number="{{ dom_id }}">
-    <span class="unit-search__count-container">
-      <span class="unit-search__count">{{ total_rows }}</span>
-      {% trans with {'context': 'Daycare search count'}%}location{% plural total_rows %}locations{% endtrans %}
-    </span>
+    <h3 class="unit-search__count-container">
+      {%- if total_rows -%}
+        {{ total_rows }} {% trans with {'context': 'Daycare search count'}%}daycare centre{% plural total_rows %}daycare centres{% endtrans %}
+      {%- else -%}
+        {{ 'No results'|t({}, {'context' : 'Unit search no results title'}) }}
+      {%- endif -%}
+    </h3>
 
-    {% if header %}
+    {% if header and not empty %}
       {{ header }}
     {% endif %}
 
     {{ rows }}
 
-    {{ empty }}
+    {%- if empty -%}
+      <p>{{ 'No results were found for the criteria you entered. Try changing your search criteria.'|t({}, {'context' : 'Unit search no results text'}) }}</p>
+    {%- endif -%}
+
     {{ pager }}
   </div>
 
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--high-school-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--high-school-search.html.twig
index ff6b2a14..d823e3a6 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--high-school-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--high-school-search.html.twig
@@ -60,10 +60,13 @@
 
   <div class="unit-search__results" data-drupal-selector="tabbed-content" data-id-number="{{ dom_id }}">
     <div class="unit-search__result-actions">
-      <span class="unit-search__count-container">
-        <span class="unit-search__count">{{ total_rows }}</span>
-        {% trans with {'context': 'High school search count'}%}general upper secondary school{% plural total_rows %}general upper secondary schools{% endtrans %}
-      </span>
+      <h3 class="unit-search__count-container">
+        {%- if total_rows -%}
+          {{ total_rows }} {% trans with {'context': 'High school search count'}%}general upper secondary school{% plural total_rows %}general upper secondary schools{% endtrans %}
+        {%- else -%}
+          {{ 'No results'|t({}, {'context' : 'Unit search no results title'}) }}
+        {%- endif -%}
+      </h3>
       <div class="tabs tabs--unit-search"
            role="tablist"
            aria-label="{{ 'Toggle between list and map view'|t({}, {'context': 'Tab-list of unit-search'}) }}">
@@ -72,13 +75,13 @@
                 id="tab-1--{{ dom_id }}"
                 role="tab"
                 aria-selected="false"
-                aria-controls="tab-1__content--{{ dom_id }}">{{ 'Show results as a list'|t }}</button>
+                aria-controls="tab-1__content--{{ dom_id }}">{{ 'View as a list'|t }}</button>
         <button class="tab tab--map"
                 data-drupal-selector="tab-2--{{ dom_id }}"
                 id="tab-2--{{ dom_id }}"
                 role="tab"
                 aria-selected="false"
-                aria-controls="tab-2__content--{{ dom_id }}">{{ 'Show results on a map'|t }}</button>
+                aria-controls="tab-2__content--{{ dom_id }}">{{ 'View in a map'|t }}</button>
       </div>
     </div>
     <div class="tab__content"
@@ -91,7 +94,9 @@
       <div class="unit-search__result--list">
         {{ rows }}
       </div>
-      {{ empty }}
+      {%- if empty -%}
+        <p>{{ 'No results were found for the criteria you entered. Try changing your search criteria.'|t({}, {'context' : 'Unit search no results text'}) }}</p>
+      {%- endif -%}
       {{ pager }}
     </div>
     <div class="tab__content"
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
index e3cb0f96..ff605886 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
@@ -49,12 +49,13 @@
   {{ attachment_before }}
 
   <div class="unit-search__results" data-id-number="{{ dom_id }}">
-    {% if total_rows %}
-      <span class="unit-search__count-container">
-        <span class="unit-search__count">{{ total_rows }}</span>
-        {% trans with {'context': 'Playground search count'}%}location{% plural total_rows %}locations{% endtrans %}
-      </span>
-    {% endif %}
+    <h3 class="unit-search__count-container">
+      {%- if total_rows -%}
+        {{ total_rows }} {% trans with {'context': 'Playground search count'}%}playground or family house{% plural total_rows %}playgrounds or family houses{% endtrans %}
+      {%- else -%}
+        {{ 'No results'|t({}, {'context' : 'Unit search no results title'}) }}
+      {%- endif -%}
+    </h3>
 
     {% if header %}
       {{ header }}
@@ -62,7 +63,9 @@
 
     {{ rows }}
 
-    {{ empty }}
+    {%- if empty -%}
+      <p>{{ 'No results were found for the criteria you entered. Try changing your search criteria.'|t({}, {'context' : 'Unit search no results text'}) }}</p>
+    {%- endif -%}
     {{ pager }}
   </div>
 
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
index 043de525..01609b1a 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
@@ -54,16 +54,22 @@
   {{ attachment_before }}
 
   <div class="unit-search__results" data-id-number="{{ dom_id }}">
-    <span class="unit-search__count-container">
-      <span class="unit-search__count">{{ total_rows }}</span>
-      {% trans with {'context': 'Vocational school search count'}%}unit{% plural total_rows %}units{% endtrans %}
-    </span>
+    <h3 class="unit-search__count-container">
+      {%- if total_rows -%}
+        {{ total_rows }} {% trans with {'context': 'Vocational school search count'}%}unit{% plural total_rows %}units{% endtrans %}
+      {%- else -%}
+        {{ 'No results'|t({}, {'context' : 'Unit search no results title'}) }}
+      {%- endif -%}
+    </h3>
 
     <div class="unit-search__result--list">
       {{ rows }}
     </div>
 
-    {{ empty }}
+    {%- if empty -%}
+      <p>{{ 'No results were found for the criteria you entered. Try changing your search criteria.'|t({}, {'context' : 'Unit search no results text'}) }}</p>
+    {%- endif -%}
+
     {{ pager }}
   </div>
   {{ attachment_after }}
diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po
index d74f783a..6603a01b 100644
--- a/public/themes/custom/hdbt_subtheme/translations/fi.po
+++ b/public/themes/custom/hdbt_subtheme/translations/fi.po
@@ -23,32 +23,32 @@ msgid_plural "units"
 msgstr[0] "toimipaikka"
 msgstr[1] "toimipaikkaa"
 
-msgid "Show results on a map"
-msgstr "Näytä tulokset kartalla"
+msgid "View in a map"
+msgstr "Näytä kartalla"
 
-msgid "Show results as a list"
-msgstr "Näytä tulokset listana"
+msgid "View as a list"
+msgstr "Näytä listana"
 
 msgid "Open large version of the map"
 msgstr "Avaa suurempi versio kartasta"
 
 msgctxt "Daycare search count"
-msgid "location"
-msgid_plural "locations"
-msgstr[0] "toimipaikka"
-msgstr[1] "toimipaikkaa"
+msgid "daycare centre"
+msgid_plural "daycare centres"
+msgstr[0] "päiväkoti"
+msgstr[1] "päiväkotia"
 
 msgctxt "After-school activity search count"
-msgid "location"
-msgid_plural "locations"
-msgstr[0] "toimipaikka"
-msgstr[1] "toimipaikkaa"
+msgid "activity location"
+msgid_plural "activity locations"
+msgstr[0] "toimintapaikka"
+msgstr[1] "toimintapaikkaa"
 
 msgctxt "Playground search count"
-msgid "location"
-msgid_plural "locations"
-msgstr[0] "toimipaikka"
-msgstr[1] "toimipaikkaa"
+msgid "playground or family house"
+msgid_plural "playgrounds or family houses"
+msgstr[0] "leikkipuisto tai perhetalo"
+msgstr[1] "leikkipuistoa tai perhetaloa"
 
 msgctxt "Group news archive link"
 msgid "All news"
diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po
index da28ccc6..7c6941e0 100644
--- a/public/themes/custom/hdbt_subtheme/translations/sv.po
+++ b/public/themes/custom/hdbt_subtheme/translations/sv.po
@@ -14,32 +14,32 @@ msgid_plural "units"
 msgstr[0] "enhet"
 msgstr[1] "enheter"
 
-msgid "Show results on a map"
-msgstr "Visa resultat på en karta"
+msgid "View in a map"
+msgstr "Visa på kartan"
 
-msgid "Show results as a list"
-msgstr "Visa resultat på en lista"
+msgid "View as a list"
+msgstr "Visa som lista"
 
 msgid "Open large version of the map"
 msgstr "Öppna den stora versionen av kartan"
 
 msgctxt "Daycare search count"
-msgid "location"
-msgid_plural "locations"
-msgstr[0] "enhet"
-msgstr[1] "enheter"
+msgid "daycare centre"
+msgid_plural "daycare centres"
+msgstr[0] "daghem"
+msgstr[1] "daghem"
 
 msgctxt "After-school activity search count"
-msgid "location"
-msgid_plural "locations"
-msgstr[0] "enhet"
-msgstr[1] "enheter"
+msgid "activity location"
+msgid_plural "activity locations"
+msgstr[0] "verksamhetsställe"
+msgstr[1] "verksamhetsställen"
 
 msgctxt "Playground search count"
-msgid "location"
-msgid_plural "locations"
-msgstr[0] "enhet"
-msgstr[1] "enheter"
+msgid "playground or family house"
+msgid_plural "playgrounds or family houses"
+msgstr[0] "lekpark eller familjehus"
+msgstr[1] "lekparker eller familjehus"
 
 msgctxt "Group news archive link"
 msgid "All news"