diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4ff6d5d9..33c74fec 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
-Severa-ID: 2108
+Severa-ID: 2132
 Severa-kuvaus: 
 Task: https://hiondigital.atlassian.net/browse/TMS-
 
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 955c3053..268f4e6d 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,11 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.8.8] - 2023-12-04
+
+- TMS-939:
+    - Search-page form accessibility fixes
+    - Header search accessibility fixes
+    - Added focus on input when opening header search
+- TMS-940:
+    - Change mobile menu dropdown links to a single button-element
+    - Hide current language on mobile header if only 2 languages in use
 - TMS-942:
     - Check / uncheck search filter checkboxes depending on choices
     - Trim contact phone number in href
     - Increase fly-out-nav z-index to prevent chatbot from overlapping elements
     - Add margin for program text-search suggestions
+- TMS-995: Show project-listing component images in projects-page
 
 ## [1.8.7] - 2023-11-21
 
diff --git a/assets/scripts/focus-on-search.js b/assets/scripts/focus-on-search.js
new file mode 100644
index 00000000..b3f4b37b
--- /dev/null
+++ b/assets/scripts/focus-on-search.js
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2023. Hion Digital
+ */
+
+// Use jQuery as $ within this file scope.
+const $ = jQuery; // eslint-disable-line no-unused-vars
+
+/**
+ * Export the class reference.
+ */
+export default class FocusOnSearch {
+
+    /**
+     * Focus on search input when button is clicked
+     */
+    FocusOnSearch() {
+        const $searchContainer = $( '#js-search-toggle-target' );
+        const $searchInput = $searchContainer.find( 'input[type=search]' );
+
+        if ( $( '#js-search-toggle' ).hasClass( 'is-active' ) ) {
+            $searchInput.trigger( 'focus' );
+        }
+    }
+
+    /**
+     * Run when the document is ready.
+     *
+     * @return {void}
+     */
+    docReady() {
+        $( '#js-search-toggle' ).on( 'click', this.FocusOnSearch.bind( this ) );
+    }
+}
diff --git a/assets/scripts/theme.js b/assets/scripts/theme.js
index b3d5145d..3cdec88d 100755
--- a/assets/scripts/theme.js
+++ b/assets/scripts/theme.js
@@ -29,6 +29,7 @@ import Countdown from './countdown';
 import ProgramSearch from './program-search';
 import LoadMore from './load-more';
 import SearchFilters from './search-filters';
+import FocusOnSearch from './focus-on-search';
 
 const globalControllers = {
     Common,
@@ -57,6 +58,7 @@ const globalControllers = {
     ProgramSearch,
     LoadMore,
     SearchFilters,
+    FocusOnSearch,
 };
 
 const templateControllers = {
diff --git a/assets/styles/ui-components/header/_fly-out-nav.scss b/assets/styles/ui-components/header/_fly-out-nav.scss
index 8147d702..4cfad5e2 100644
--- a/assets/styles/ui-components/header/_fly-out-nav.scss
+++ b/assets/styles/ui-components/header/_fly-out-nav.scss
@@ -134,21 +134,42 @@ $fly-out-nav-search-button-icon: $primary !default;
 
             > .navbar-dropdown-control {
                 color: $fly-out-nav-primary-link;
-
-                > .navbar-link {
-                    padding-left: 0;
-                }
+                padding: .5rem 0;
 
                 > .dropdown-toggler {
-                    width: 2.5rem;
-                    height: 2.5rem;
+                    display: flex;
+                    justify-content: space-between;
+                    width: 100%;
                     margin-right: 0;
                     color: inherit;
+
+                    .navbar-link-title {
+                        color: $fly-out-nav-primary-link;
+                        font-family: $family-primary;
+                        font-size: 1.223rem;
+                        font-weight: 600;
+                    }
+
+                    &:hover,
+                    &:focus {
+                        .navbar-link-title {
+                            text-decoration: underline;
+                        }
+                    }
+                }
+
+                .dropdown-toggler[aria-expanded=true] {
+                    transform: rotate(0) !important; // sass-lint:disable-line no-important
+
+                    .icon {
+                        transform: rotate(180deg);
+                    }
                 }
 
                 .icon {
                     color: inherit;
                     fill: currentColor;
+                    transition: transform 86ms ease-out;
                 }
             }
 
diff --git a/assets/styles/views/_page-project.scss b/assets/styles/views/_page-project.scss
index 52c7266f..84faccae 100644
--- a/assets/styles/views/_page-project.scss
+++ b/assets/styles/views/_page-project.scss
@@ -53,10 +53,4 @@
             }
         }
     }
-
-    .tredu-events {
-        .image {
-            display: none;
-        }
-    }
 }
diff --git a/assets/styles/views/_search.scss b/assets/styles/views/_search.scss
index 9e5ffaf0..ae64d868 100644
--- a/assets/styles/views/_search.scss
+++ b/assets/styles/views/_search.scss
@@ -57,6 +57,9 @@ $search-item-hover: $primary-dark !default;
     background-color: $color-light-gray;
 
     &__inner {
+        display: flex;
+        flex-direction: column-reverse;
+
         @include from($desktop) {
             margin-right: 8.06rem;
         }
@@ -112,7 +115,7 @@ $search-item-hover: $primary-dark !default;
                 }
 
                 span {
-                    margin-left: .25rem !important; // sass-lint:disable-line no-important
+                    margin-left: .25rem;
                 }
             }
         }
diff --git a/lang/fi.mo b/lang/fi.mo
index a996c666..a509a498 100644
Binary files a/lang/fi.mo and b/lang/fi.mo differ
diff --git a/lang/fi.po b/lang/fi.po
index 2ad1bcbe..6029c8cb 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2023-11-20 15:19+0200\n"
-"PO-Revision-Date: 2023-11-20 15:20+0200\n"
+"POT-Creation-Date: 2023-11-21 23:09+0200\n"
+"PO-Revision-Date: 2023-11-21 23:10+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fi\n"
@@ -23,6 +23,11 @@ msgstr ""
 "X-Poedit-SearchPathExcluded-1: vendor\n"
 "X-Poedit-SearchPathExcluded-2: node_modules\n"
 
+#: assets/dist/vendor.js:4873
+msgctxt "text direction"
+msgid "ltr"
+msgstr "ltr"
+
 #: comments.php:14
 msgid "Comments"
 msgstr "Kommentit"
@@ -673,7 +678,7 @@ msgid "Search from site"
 msgstr "Etsi sivustolta"
 
 #: models/strings.php:56 models/strings.php:83 models/strings.php:146
-#: models/strings.php:159 models/strings.php:168 models/strings.php:266
+#: models/strings.php:159 models/strings.php:168 models/strings.php:267
 msgctxt "theme-frontend"
 msgid "Close"
 msgstr "Sulje"
@@ -823,12 +828,12 @@ msgctxt "theme-frontend"
 msgid "Articletype:"
 msgstr "Artikkelityyppi:"
 
-#: models/strings.php:111 models/strings.php:222
+#: models/strings.php:111 models/strings.php:223
 msgctxt "theme-frontend"
 msgid "Month"
 msgstr "Kuukausi"
 
-#: models/strings.php:112 models/strings.php:223
+#: models/strings.php:112 models/strings.php:224
 msgctxt "theme-frontend"
 msgid "Year"
 msgstr "Vuosi"
@@ -848,62 +853,62 @@ msgctxt "theme-frontend"
 msgid "The page reloads after the selection."
 msgstr "Sivu latautuu uudelleen valinnan jälkeen."
 
-#: models/strings.php:118 models/strings.php:236
+#: models/strings.php:118 models/strings.php:237
 msgctxt "theme-frontend"
 msgid "January"
 msgstr "tammikuu"
 
-#: models/strings.php:119 models/strings.php:237
+#: models/strings.php:119 models/strings.php:238
 msgctxt "theme-frontend"
 msgid "February"
 msgstr "helmikuu"
 
-#: models/strings.php:120 models/strings.php:238
+#: models/strings.php:120 models/strings.php:239
 msgctxt "theme-frontend"
 msgid "March"
 msgstr "maaliskuu"
 
-#: models/strings.php:121 models/strings.php:239
+#: models/strings.php:121 models/strings.php:240
 msgctxt "theme-frontend"
 msgid "April"
 msgstr "huhtikuu"
 
-#: models/strings.php:122 models/strings.php:240 models/strings.php:254
+#: models/strings.php:122 models/strings.php:241 models/strings.php:255
 msgctxt "theme-frontend"
 msgid "May"
 msgstr "toukokuu"
 
-#: models/strings.php:123 models/strings.php:241
+#: models/strings.php:123 models/strings.php:242
 msgctxt "theme-frontend"
 msgid "June"
 msgstr "kesäkuu"
 
-#: models/strings.php:124 models/strings.php:242
+#: models/strings.php:124 models/strings.php:243
 msgctxt "theme-frontend"
 msgid "July"
 msgstr "heinäkuu"
 
-#: models/strings.php:125 models/strings.php:243
+#: models/strings.php:125 models/strings.php:244
 msgctxt "theme-frontend"
 msgid "August"
 msgstr "elokuu"
 
-#: models/strings.php:126 models/strings.php:244
+#: models/strings.php:126 models/strings.php:245
 msgctxt "theme-frontend"
 msgid "September"
 msgstr "syyskuu"
 
-#: models/strings.php:127 models/strings.php:245
+#: models/strings.php:127 models/strings.php:246
 msgctxt "theme-frontend"
 msgid "October"
 msgstr "lokakuu"
 
-#: models/strings.php:128 models/strings.php:246
+#: models/strings.php:128 models/strings.php:247
 msgctxt "theme-frontend"
 msgid "November"
 msgstr "marraskuu"
 
-#: models/strings.php:129 models/strings.php:247
+#: models/strings.php:129 models/strings.php:248
 msgctxt "theme-frontend"
 msgid "December"
 msgstr "joulukuu"
@@ -1129,157 +1134,162 @@ msgctxt "theme-frontend"
 msgid "Write search terms"
 msgstr "Kirjoita hakusanat"
 
-#: models/strings.php:212
+#: models/strings.php:210
+msgctxt "theme-frontend"
+msgid "Page location:"
+msgstr "Sivun sijainti:"
+
+#: models/strings.php:213
 msgctxt "theme-frontend"
 msgid "Filter"
 msgstr "Rajaa"
 
-#: models/strings.php:213
+#: models/strings.php:214
 msgctxt "theme-frontend"
 msgid "Clicking the link will download file"
 msgstr "Linkin avaaminen lataa tiedoston"
 
-#: models/strings.php:217 models/strings.php:225
+#: models/strings.php:218 models/strings.php:226
 msgctxt "theme-frontend"
 msgid "Pick a date"
 msgstr "Valitse päivämäärä"
 
-#: models/strings.php:218
+#: models/strings.php:219
 msgctxt "theme-frontend"
 msgid "dd.mm.yyyy"
 msgstr "pp.kk.vvvv"
 
-#: models/strings.php:219
+#: models/strings.php:220
 msgctxt "theme-frontend"
 msgid "The chosen date is"
 msgstr "Valittu päivämäärä on"
 
-#: models/strings.php:220
+#: models/strings.php:221
 msgctxt "theme-frontend"
 msgid "Previous month"
 msgstr "Edellinen kuukausi"
 
-#: models/strings.php:221
+#: models/strings.php:222
 msgctxt "theme-frontend"
 msgid "Next month"
 msgstr "Seuraava kuukausi"
 
-#: models/strings.php:224
+#: models/strings.php:225
 msgctxt "theme-frontend"
 msgid "Close window"
 msgstr "Sulje ikkuna"
 
-#: models/strings.php:227
+#: models/strings.php:228
 msgctxt "theme-frontend"
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: models/strings.php:228
+#: models/strings.php:229
 msgctxt "theme-frontend"
 msgid "Monday"
 msgstr "Maanantai"
 
-#: models/strings.php:229
+#: models/strings.php:230
 msgctxt "theme-frontend"
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: models/strings.php:230
+#: models/strings.php:231
 msgctxt "theme-frontend"
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: models/strings.php:231
+#: models/strings.php:232
 msgctxt "theme-frontend"
 msgid "Thursday"
 msgstr "Torstai"
 
-#: models/strings.php:232
+#: models/strings.php:233
 msgctxt "theme-frontend"
 msgid "Friday"
 msgstr "Perjantai"
 
-#: models/strings.php:233
+#: models/strings.php:234
 msgctxt "theme-frontend"
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: models/strings.php:250
+#: models/strings.php:251
 msgctxt "theme-frontend"
 msgid "Jan"
 msgstr "Tam"
 
-#: models/strings.php:251
+#: models/strings.php:252
 msgctxt "theme-frontend"
 msgid "Feb"
 msgstr "Hel"
 
-#: models/strings.php:252
+#: models/strings.php:253
 msgctxt "theme-frontend"
 msgid "Mar"
 msgstr "Maa"
 
-#: models/strings.php:253
+#: models/strings.php:254
 msgctxt "theme-frontend"
 msgid "Apr"
 msgstr "Huh"
 
-#: models/strings.php:255
+#: models/strings.php:256
 msgctxt "theme-frontend"
 msgid "Jun"
 msgstr "Kes"
 
-#: models/strings.php:256
+#: models/strings.php:257
 msgctxt "theme-frontend"
 msgid "Jul"
 msgstr "Hei"
 
-#: models/strings.php:257
+#: models/strings.php:258
 msgctxt "theme-frontend"
 msgid "Aug"
 msgstr "Elo"
 
-#: models/strings.php:258
+#: models/strings.php:259
 msgctxt "theme-frontend"
 msgid "Sept"
 msgstr "Syys"
 
-#: models/strings.php:259
+#: models/strings.php:260
 msgctxt "theme-frontend"
 msgid "Oct"
 msgstr "Loka"
 
-#: models/strings.php:260
+#: models/strings.php:261
 msgctxt "theme-frontend"
 msgid "Nov"
 msgstr "Mar"
 
-#: models/strings.php:261
+#: models/strings.php:262
 msgctxt "theme-frontend"
 msgid "Dec"
 msgstr "Jou"
 
-#: models/strings.php:265
+#: models/strings.php:266
 msgctxt "theme-frontend"
 msgid "Enlarged image"
 msgstr "Suurennettu kuva"
 
-#: models/strings.php:269
+#: models/strings.php:270
 msgctxt "theme-frontend"
 msgid "Load more"
 msgstr "Lataa lisää"
 
-#: models/strings.php:270
+#: models/strings.php:271
 msgctxt "theme-frontend"
 msgid "Load more programs"
 msgstr "Lataa lisää koulutuksia"
 
-#: models/strings.php:271
+#: models/strings.php:272
 msgctxt "theme-frontend"
 msgid "More results loaded"
 msgstr "Lisää tuloksia ladattu"
 
-#: models/strings.php:284
+#: models/strings.php:285
 msgid "Pagination"
 msgstr "Sivutus"
 
@@ -1344,10 +1354,6 @@ msgstr ""
 #~ msgid "Dialog Window - Close (Press escape to close)"
 #~ msgstr "Dialogi-ikkuna - sulje (Sulje painamalla Esc -näppäintä)"
 
-#~ msgctxt "text direction"
-#~ msgid "ltr"
-#~ msgstr "ltr"
-
 #, fuzzy
 #~| msgid "Program search"
 #~ msgid "#program-search-words"
diff --git a/lang/tms-theme-base.pot b/lang/tms-theme-base.pot
index c55bf923..469b88dd 100644
--- a/lang/tms-theme-base.pot
+++ b/lang/tms-theme-base.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TMS Theme Base\n"
-"POT-Creation-Date: 2023-11-20 15:19+0200\n"
+"POT-Creation-Date: 2023-11-21 23:09+0200\n"
 "PO-Revision-Date: 2022-01-12 10:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -23,6 +23,11 @@ msgstr ""
 "X-Poedit-SearchPathExcluded-1: vendor\n"
 "X-Poedit-SearchPathExcluded-2: node_modules\n"
 
+#: assets/dist/vendor.js:4873
+msgctxt "text direction"
+msgid "ltr"
+msgstr ""
+
 #: comments.php:14
 msgid "Comments"
 msgstr ""
@@ -667,7 +672,7 @@ msgid "Search from site"
 msgstr ""
 
 #: models/strings.php:56 models/strings.php:83 models/strings.php:146
-#: models/strings.php:159 models/strings.php:168 models/strings.php:266
+#: models/strings.php:159 models/strings.php:168 models/strings.php:267
 msgctxt "theme-frontend"
 msgid "Close"
 msgstr ""
@@ -817,12 +822,12 @@ msgctxt "theme-frontend"
 msgid "Articletype:"
 msgstr ""
 
-#: models/strings.php:111 models/strings.php:222
+#: models/strings.php:111 models/strings.php:223
 msgctxt "theme-frontend"
 msgid "Month"
 msgstr ""
 
-#: models/strings.php:112 models/strings.php:223
+#: models/strings.php:112 models/strings.php:224
 msgctxt "theme-frontend"
 msgid "Year"
 msgstr ""
@@ -842,62 +847,62 @@ msgctxt "theme-frontend"
 msgid "The page reloads after the selection."
 msgstr ""
 
-#: models/strings.php:118 models/strings.php:236
+#: models/strings.php:118 models/strings.php:237
 msgctxt "theme-frontend"
 msgid "January"
 msgstr ""
 
-#: models/strings.php:119 models/strings.php:237
+#: models/strings.php:119 models/strings.php:238
 msgctxt "theme-frontend"
 msgid "February"
 msgstr ""
 
-#: models/strings.php:120 models/strings.php:238
+#: models/strings.php:120 models/strings.php:239
 msgctxt "theme-frontend"
 msgid "March"
 msgstr ""
 
-#: models/strings.php:121 models/strings.php:239
+#: models/strings.php:121 models/strings.php:240
 msgctxt "theme-frontend"
 msgid "April"
 msgstr ""
 
-#: models/strings.php:122 models/strings.php:240 models/strings.php:254
+#: models/strings.php:122 models/strings.php:241 models/strings.php:255
 msgctxt "theme-frontend"
 msgid "May"
 msgstr ""
 
-#: models/strings.php:123 models/strings.php:241
+#: models/strings.php:123 models/strings.php:242
 msgctxt "theme-frontend"
 msgid "June"
 msgstr ""
 
-#: models/strings.php:124 models/strings.php:242
+#: models/strings.php:124 models/strings.php:243
 msgctxt "theme-frontend"
 msgid "July"
 msgstr ""
 
-#: models/strings.php:125 models/strings.php:243
+#: models/strings.php:125 models/strings.php:244
 msgctxt "theme-frontend"
 msgid "August"
 msgstr ""
 
-#: models/strings.php:126 models/strings.php:244
+#: models/strings.php:126 models/strings.php:245
 msgctxt "theme-frontend"
 msgid "September"
 msgstr ""
 
-#: models/strings.php:127 models/strings.php:245
+#: models/strings.php:127 models/strings.php:246
 msgctxt "theme-frontend"
 msgid "October"
 msgstr ""
 
-#: models/strings.php:128 models/strings.php:246
+#: models/strings.php:128 models/strings.php:247
 msgctxt "theme-frontend"
 msgid "November"
 msgstr ""
 
-#: models/strings.php:129 models/strings.php:247
+#: models/strings.php:129 models/strings.php:248
 msgctxt "theme-frontend"
 msgid "December"
 msgstr ""
@@ -1117,157 +1122,162 @@ msgctxt "theme-frontend"
 msgid "Write search terms"
 msgstr ""
 
-#: models/strings.php:212
+#: models/strings.php:210
 msgctxt "theme-frontend"
-msgid "Filter"
+msgid "Page location:"
 msgstr ""
 
 #: models/strings.php:213
 msgctxt "theme-frontend"
+msgid "Filter"
+msgstr ""
+
+#: models/strings.php:214
+msgctxt "theme-frontend"
 msgid "Clicking the link will download file"
 msgstr ""
 
-#: models/strings.php:217 models/strings.php:225
+#: models/strings.php:218 models/strings.php:226
 msgctxt "theme-frontend"
 msgid "Pick a date"
 msgstr ""
 
-#: models/strings.php:218
+#: models/strings.php:219
 msgctxt "theme-frontend"
 msgid "dd.mm.yyyy"
 msgstr ""
 
-#: models/strings.php:219
+#: models/strings.php:220
 msgctxt "theme-frontend"
 msgid "The chosen date is"
 msgstr ""
 
-#: models/strings.php:220
+#: models/strings.php:221
 msgctxt "theme-frontend"
 msgid "Previous month"
 msgstr ""
 
-#: models/strings.php:221
+#: models/strings.php:222
 msgctxt "theme-frontend"
 msgid "Next month"
 msgstr ""
 
-#: models/strings.php:224
+#: models/strings.php:225
 msgctxt "theme-frontend"
 msgid "Close window"
 msgstr ""
 
-#: models/strings.php:227
+#: models/strings.php:228
 msgctxt "theme-frontend"
 msgid "Sunday"
 msgstr ""
 
-#: models/strings.php:228
+#: models/strings.php:229
 msgctxt "theme-frontend"
 msgid "Monday"
 msgstr ""
 
-#: models/strings.php:229
+#: models/strings.php:230
 msgctxt "theme-frontend"
 msgid "Tuesday"
 msgstr ""
 
-#: models/strings.php:230
+#: models/strings.php:231
 msgctxt "theme-frontend"
 msgid "Wednesday"
 msgstr ""
 
-#: models/strings.php:231
+#: models/strings.php:232
 msgctxt "theme-frontend"
 msgid "Thursday"
 msgstr ""
 
-#: models/strings.php:232
+#: models/strings.php:233
 msgctxt "theme-frontend"
 msgid "Friday"
 msgstr ""
 
-#: models/strings.php:233
+#: models/strings.php:234
 msgctxt "theme-frontend"
 msgid "Saturday"
 msgstr ""
 
-#: models/strings.php:250
+#: models/strings.php:251
 msgctxt "theme-frontend"
 msgid "Jan"
 msgstr ""
 
-#: models/strings.php:251
+#: models/strings.php:252
 msgctxt "theme-frontend"
 msgid "Feb"
 msgstr ""
 
-#: models/strings.php:252
+#: models/strings.php:253
 msgctxt "theme-frontend"
 msgid "Mar"
 msgstr ""
 
-#: models/strings.php:253
+#: models/strings.php:254
 msgctxt "theme-frontend"
 msgid "Apr"
 msgstr ""
 
-#: models/strings.php:255
+#: models/strings.php:256
 msgctxt "theme-frontend"
 msgid "Jun"
 msgstr ""
 
-#: models/strings.php:256
+#: models/strings.php:257
 msgctxt "theme-frontend"
 msgid "Jul"
 msgstr ""
 
-#: models/strings.php:257
+#: models/strings.php:258
 msgctxt "theme-frontend"
 msgid "Aug"
 msgstr ""
 
-#: models/strings.php:258
+#: models/strings.php:259
 msgctxt "theme-frontend"
 msgid "Sept"
 msgstr ""
 
-#: models/strings.php:259
+#: models/strings.php:260
 msgctxt "theme-frontend"
 msgid "Oct"
 msgstr ""
 
-#: models/strings.php:260
+#: models/strings.php:261
 msgctxt "theme-frontend"
 msgid "Nov"
 msgstr ""
 
-#: models/strings.php:261
+#: models/strings.php:262
 msgctxt "theme-frontend"
 msgid "Dec"
 msgstr ""
 
-#: models/strings.php:265
+#: models/strings.php:266
 msgctxt "theme-frontend"
 msgid "Enlarged image"
 msgstr ""
 
-#: models/strings.php:269
+#: models/strings.php:270
 msgctxt "theme-frontend"
 msgid "Load more"
 msgstr ""
 
-#: models/strings.php:270
+#: models/strings.php:271
 msgctxt "theme-frontend"
 msgid "Load more programs"
 msgstr ""
 
-#: models/strings.php:271
+#: models/strings.php:272
 msgctxt "theme-frontend"
 msgid "More results loaded"
 msgstr ""
 
-#: models/strings.php:284
+#: models/strings.php:285
 msgid "Pagination"
 msgstr ""
 
diff --git a/models/shared/header.php b/models/shared/header.php
index 6da0a39d..e125b4dc 100644
--- a/models/shared/header.php
+++ b/models/shared/header.php
@@ -88,9 +88,18 @@ public function language_nav() : ?array {
             'hide_empty' => 0,
         ];
 
-        $languages = pll_the_languages( $args );
+        $languages = \pll_the_languages( $args );
         $lang_data = [ 'all' => $languages ];
 
+        // If there are two languages, show only one in mobile view
+        if ( count( $languages ) === 2 ) {
+            $args['hide_current'] = 1;
+            $without_current      = \pll_the_languages( $args );
+            $lang_data_mobile     = [
+                'all' => $without_current,
+            ];
+        }
+
         foreach ( $languages as $lang ) {
             if ( ! empty( $lang['current_lang'] ) ) {
                 $lang_data['current'] = $lang;
@@ -101,10 +110,11 @@ public function language_nav() : ?array {
         }
 
         return [
-            'partial' => 'dropdown' === $lang_nav_display
+            'partial'               => 'dropdown' === $lang_nav_display
                 ? 'ui/menu/language-nav-dropdown'
                 : 'ui/menu/language-nav',
-            'links'   => $lang_data,
+            'links'                 => $lang_data,
+            'links_without_current' => $lang_data_mobile,
         ];
     }
 
@@ -393,6 +403,13 @@ public function menu_item_classes( $classes, $item ) : array {
         }
 
         $current_page = \get_queried_object();
+
+        // Check if current page is in a dropdown and add aria-current to the top-level link
+        if ( in_array( $current_page->ID, array_column( $item->sub_menu, 'object_id' ) ) ) {
+            $classes['is_current_parent'] = true;
+        }
+
+        // Add current link class
         if ( ! empty( $current_page->ID ) && (int) $item->object_id === $current_page->ID ) {
             $classes['is_current'] = 'is-current';
         }
diff --git a/models/strings.php b/models/strings.php
index cb17eaf3..efdc553d 100644
--- a/models/strings.php
+++ b/models/strings.php
@@ -207,6 +207,7 @@ public function s() : array {
                 'filter_by_post_type' => _x( 'Filter by type', 'theme-frontend', 'tms-theme-tredu' ),
                 'filter_by_date'      => _x( 'Publish date', 'theme-frontend', 'tms-theme-tredu' ),
                 'write_search_terms'  => _x( 'Write search terms', 'theme-frontend', 'tms-theme-tredu' ),
+                'breadcrumbs'         => _x( 'Page location:', 'theme-frontend', 'tms-theme-tredu' ),
             ],
             'page_materials'     => [
                 'filter'        => _x( 'Filter', 'theme-frontend', 'tms-theme-tredu' ),
diff --git a/partials/shared/header-inner.dust b/partials/shared/header-inner.dust
index 298e3f14..c058983b 100644
--- a/partials/shared/header-inner.dust
+++ b/partials/shared/header-inner.dust
@@ -16,11 +16,17 @@
             {/Header.lang_nav_horizontal}
 
             {?Header.lang_nav_horizontal}
-            <div class="is-hidden-desktop">
+                <div class="is-hidden-desktop">
+                    {?Header.language_nav.links_without_current}
+                        {>"ui/menu/language-nav" links=Header.language_nav.links_without_current /}
+                    {:else}
+                        {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
+                    {/Header.language_nav.links_without_current}
+                </div>
             {/Header.lang_nav_horizontal}
-            {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
-            {?Header.lang_nav_horizontal}
-            </div>
+
+            {^Header.lang_nav_horizontal}
+                {>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
             {/Header.lang_nav_horizontal}
 
             {^Header.hide_search}
@@ -31,7 +37,7 @@
                 <button class="fly-out-nav__trigger {?Header.hide_search}ml-4{/Header.hide_search} {^Header.hide_main_nav}is-hidden-widescreen{/Header.hide_main_nav}"
                         data-micromodal-trigger="js-fly-out-nav">
                     {>"ui/icon" icon="burger" class="icon--large" /}
-                    <span class="is-sr-only">{Strings.s.header.open_menu|s}</span>
+                    <span class="is-sr-only">{Strings.s.header.open_menu|html}</span>
                 </button>
             {/Header.has_nav_menu}
 
@@ -41,17 +47,16 @@
 
     {^Header.hide_search}
         <div id="js-search-toggle-target"
-             class="site-header__popup is-hidden is-absolute has-right-0 has-bottom-0 has-left-0 has-transform-y-100 {Header.colors.search_popup_container}"
-             role="search">
+             class="site-header__popup is-hidden is-absolute has-right-0 has-bottom-0 has-left-0 has-transform-y-100 {Header.colors.search_popup_container|attr}">
             <div class="container">
                 <div class="columns">
                     <div class="column is-8 is-offset-2-tablet is-6-desktop is-offset-3-desktop">
                         <div class="pt-6 pb-6 pt-8-desktop pb-8-desktop">
-                            <div class="popup__label h4 mb-6">
-                                {Strings.s.header.search_title|s}
+                            <div id="header-search-title" class="popup__label h4 mb-6">
+                                {Strings.s.header.search_title|html}
                             </div>
 
-                            {>"ui/search-form" button_class="is-primary mb-2 mb-0-tablet" /}
+                            {>"ui/search-form" button_class="is-primary mb-2 mb-0-tablet" search_title="header-search-title" /}
                         </div>
                     </div>
                 </div>
@@ -61,7 +66,7 @@
 </div>
 
 {^Header.hide_main_nav}
-    <div class="site-header__nav is-relative is-hidden-touch is-hidden-desktop-only has-border has-border-top-1 has-border-secondary {Header.colors.nav|s}">
+    <div class="site-header__nav is-relative is-hidden-touch is-hidden-desktop-only has-border has-border-top-1 has-border-secondary {Header.colors.nav|attr}">
         <div class="container">
             <div class="columns mt-0 mb-0">
                 <nav class="column pt-0 pb-0" aria-label="{Strings.s.header.main_navigation|attr}">
diff --git a/partials/ui/breadcrumbs.dust b/partials/ui/breadcrumbs.dust
index dc64bdaf..d8db1efe 100644
--- a/partials/ui/breadcrumbs.dust
+++ b/partials/ui/breadcrumbs.dust
@@ -1,12 +1,12 @@
 {?breadcrumbs}
-<nav class="breadcrumb" aria-label="{Strings.s.header.breadcrumbs|s}">
+<nav class="breadcrumb" aria-label="{Strings.s.header.breadcrumbs|attr}">
     <ul class="breadcrumbs__nav is-relative is-flex m-0 p-0 is-family-secondary">
         {#breadcrumbs}
-            <li class="{?is_active}is-active{/is_active} {?class}{class}{/class}">
+            <li class="{?is_active}is-active{/is_active} {?class}{class|attr}{/class}">
                 {?permalink}
-                    <a href="{permalink}" {?is_active}aria-current="page"{/is_active} class="p-0 mr-2">                     
+                    <a href="{permalink|url}" {?is_active}aria-current="page"{/is_active} class="p-0 mr-2">
                         {?title}
-                            {title|s}
+                            {title|html}
                         {/title}
 
                         {?icon}
@@ -16,7 +16,7 @@
                 {:else}
                     <span {?is_active}aria-current="page"{/is_active}>
                         {?title}
-                            {title|s}
+                            {title|html}
                         {/title}
                     </span>
                 {/permalink}
diff --git a/partials/ui/menu/fly-out-nav.dust b/partials/ui/menu/fly-out-nav.dust
index b4182cf6..21ce374b 100644
--- a/partials/ui/menu/fly-out-nav.dust
+++ b/partials/ui/menu/fly-out-nav.dust
@@ -1,8 +1,8 @@
 <nav id="js-fly-out-nav" class="fly-out-nav overlay overlay--dark-80" aria-hidden="true">
     <div class="is-overlay" tabindex="-1" data-micromodal-close>
-        <div class="fly-out-nav__inner {Header.colors.fly_out_nav.inner|s}" role="dialog" aria-modal="true">
+        <div class="fly-out-nav__inner {Header.colors.fly_out_nav.inner|attr}" role="dialog" aria-modal="true">
             <button class="fly-out-nav__close">
-                <span class="is-sr-only"> {Strings.s.header.close_menu|s} </span>
+                <span class="is-sr-only"> {Strings.s.header.close_menu|html} </span>
                 {>"ui/icon" icon="close" class="icon--large {Header.colors.fly_out_nav.close_menu}" /}
             </button>
 
@@ -24,11 +24,11 @@
 
             {^Header.hide_search}
                 <div class="search-form-wrapper pl-6">
-                    <div class="h4 mt-9 mb-4 {Header.colors.fly_out_nav.search_title}">
-                        {Strings.s.header.search_title|s}
+                    <div id="fly-out-nav-search-title" class="h4 mt-9 mb-4 {Header.colors.fly_out_nav.search_title|attr}">
+                        {Strings.s.header.search_title|html}
                     </div>
 
-                    {>"search-form" button_class="{Header.colors.fly_out_nav.search_button} mb-2 mb-0-tablet" /}
+                    {>"search-form" button_class="{Header.colors.fly_out_nav.search_button} mb-2 mb-0-tablet" search_title="fly-out-nav-search-title" /}
                 </div>
             {/Header.hide_search}
 
diff --git a/partials/ui/menu/menu-item-simple.dust b/partials/ui/menu/menu-item-simple.dust
index dee8b381..4aeb5427 100644
--- a/partials/ui/menu/menu-item-simple.dust
+++ b/partials/ui/menu/menu-item-simple.dust
@@ -1,5 +1,5 @@
-<a href="{url}" class="navbar-item {#classes}{.}{@sep} {/sep}{/classes}" {?classes.is_current}aria-page='current'{/classes.is_current}>
-    {title|s}
+<a href="{url|url}" class="navbar-item {#classes}{.}{@sep} {/sep}{/classes}" {?classes.is_current}aria-current="page"{/classes.is_current}>
+    {title|html}
 
     {?icon}
         {?icon-classes}
diff --git a/partials/ui/menu/menu-item.dust b/partials/ui/menu/menu-item.dust
index 9d3dcac1..235b29cc 100644
--- a/partials/ui/menu/menu-item.dust
+++ b/partials/ui/menu/menu-item.dust
@@ -5,12 +5,11 @@
 {?sub_menu}
     <li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
         <div class="navbar-dropdown-control">
-            <a class="navbar-link is-arrowless" href="{url}" {?classes.is_current}aria-page="current"{/classes.is_current}>
-                {title|s}
-            </a>
-
-            <button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-{$idx}">
-                <span class="is-sr-only">{data.open_menu|s}</span>
+            <button class="dropdown-toggler pl-0 pr-4" aria-expanded=false aria-controls="js-navbar-menu-item-{$idx|attr}" {?classes.is_current_parent}aria-current="true"{/classes.is_current_parent}>
+                <span class="navbar-link-title">
+                    {title|html}
+                </span>
+                <span class="is-sr-only">{data.open_menu|html}</span>
 
                 <span aria-hidden="true">
                     {>"ui/icon" icon="chevron-down" class="icon--medium" /}
@@ -18,10 +17,12 @@
             </button>
         </div>
 
-        <div class="navbar-dropdown is-hidden-touch" id="js-navbar-menu-item-{$idx}">
+        <ul class="navbar-dropdown is-hidden-touch is-unstyled pt-2 pb-2" id="js-navbar-menu-item-{$idx|attr}">
             {#sub_menu}
-                {>"ui/menu/menu-item-simple" /}
+                <li>
+                    {>"ui/menu/menu-item-simple" /}
+                </li>
             {/sub_menu}
-        </div>
+        </ul>
     </li>
 {/sub_menu}
diff --git a/partials/ui/search-form.dust b/partials/ui/search-form.dust
index 9ff743e1..77292746 100644
--- a/partials/ui/search-form.dust
+++ b/partials/ui/search-form.dust
@@ -1,12 +1,12 @@
-<form role="search" method="get" class="search-form is-flex is-flex-wrap-wrap is-align-items-center" action="{Header.search_action|s}">
+<form role="search" method="get" class="search-form is-flex is-flex-wrap-wrap is-align-items-center" action="{Header.search_action|attr}">
     <label class="mb-2 mb-0-tablet mr-2 is-flex-grow-1">
-        <span class="is-sr-only"> {Strings.s.header.search_input_label|s} </span>
         <input type="search" class="search-form__input has-border-radius-small has-background-light p-3 has-width-100"
-               placeholder="{Strings.s.header.search_input_placeholder|s}" value="{search_query|s}" name="s">
+               aria-labelledby="{search_title|attr}"
+               value="{search_query|attr}" name="s">
     </label>
 
-    <button type="submit" class="search-form__button button button--icon {button_class|s}">
-        {Strings.s.header.search|s}
+    <button type="submit" class="search-form__button button button--icon {button_class|attr}">
+        {Strings.s.header.search|html}
         {>"ui/icon" icon="search" class="icon--medium"  /}
     </button>
 </form>
diff --git a/partials/views/search/form-filters.dust b/partials/views/search/form-filters.dust
index 0e71de31..b3f6e99d 100644
--- a/partials/views/search/form-filters.dust
+++ b/partials/views/search/form-filters.dust
@@ -5,17 +5,17 @@
                 <div class="search-filters">
                     <div class="search-filters">
                         <div class="search-filters__group">
-                            <div class="search-filters__label has-text-black has-text-weight-normal mb-2">
-                                {form.filter_by_post_type}
+                            <div id="search-filters-label" class="search-filters__label has-text-black has-text-weight-normal mb-2">
+                                {form.filter_by_post_type|html}
                             </div>
-                            <div class="is-flex is-flex-wrap-wrap">
+                            <div class="is-flex is-flex-wrap-wrap" role="group" aria-labelledby="search-filters-label">
                                 {#form.post_types}
                                     <input type="checkbox" name="search_post_types[]"
-                                           class="is-checkradio search-filters__post-type" value="{slug}"
-                                           id="cpt-{slug|s}"
+                                           class="is-checkradio search-filters__post-type" value="{slug|attr}"
+                                           id="cpt-{slug|attr}"
                                            {?is_checked}checked{/is_checked}>
-                                    <label class="is-block mr-4 ml-0 mb-2" for="cpt-{slug|s}">
-                                        {name|s}
+                                    <label class="is-block mr-4 ml-0 mb-2" for="cpt-{slug|attr}">
+                                        {name|html}
                                     </label>
                                 {/form.post_types}
                             </div>
@@ -23,32 +23,32 @@
 
                         <div class="search-filters__group mt-4">
                             <div class="search-filters__label has-text-black has-text-weight-normal mb-2">
-                                {form.filter_by_date}
+                                {form.filter_by_date|html}
                             </div>
 
                             <div class="search-filters__filter">
                                 <div class="is-inline-block mb-2">
                                     <label for="start-date">
-                                        <span class="is-sr-only">{form.filter_start_date|s}</span>
+                                        <span class="is-sr-only">{form.filter_start_date|html}</span>
                                     </label>
                                     <span class="is-block has-after-line">
                                             <duet-date-picker
                                                 identifier="start-date"
                                                 name="search_start_date"
-                                                value="{form.form_start_date}"
-                                                data-locale="{Header.site_locale}"></duet-date-picker>
+                                                value="{form.form_start_date|attr}"
+                                                data-locale="{Header.site_locale|attr}"></duet-date-picker>
                                         </span>
                                 </div>
                                 <div class="is-inline-block mb-2">
                                     <label for="end-date">
-                                        <span class="is-sr-only">{form.filter_end_date|s}</span>
+                                        <span class="is-sr-only">{form.filter_end_date|html}</span>
                                     </label>
                                     <span class="is-block">
                                             <duet-date-picker
                                                 identifier="end-date"
                                                 name="search_end_date"
-                                                value="{form.form_end_date}"
-                                                data-locale="{Header.site_locale}"></duet-date-picker>
+                                                value="{form.form_end_date|attr}"
+                                                data-locale="{Header.site_locale|attr}"></duet-date-picker>
                                         </span>
                                 </div>
 
diff --git a/partials/views/search/results.dust b/partials/views/search/results.dust
index 4c63c270..5f50fe9e 100644
--- a/partials/views/search/results.dust
+++ b/partials/views/search/results.dust
@@ -1,34 +1,65 @@
 <div class="search__results">
     <p class="mt-6 mb-4">
-        {results.summary|s}
+        {results.summary|html}
     </p>
 
     {#results.posts}
         <div class="search-item mb-6 p-6 p-8-desktop {template_classes.search_item|s}">
             <div class="search-item__inner">
-                {?breadcrumbs}
-                    <div class="search-item__meta-container has-text-weight-medium">
-                        {>"breadcrumbs" bc_icon="chevron-right" icon_classes="icon--small" /}
-                    </div>
-                {/breadcrumbs}
-
-                {?meta}
-                    <div class="search-item__meta-container has-text-weight-medium">
-                        {>"views/search/search-item-meta"  /}
-                    </div>
-                {/meta}
-
-                <h2 class="h5 mt-4 mb-0 searcwh-item__title">
-                    <a href="{permalink}" class="">
-                        {post_title|html}
-                    </a>
-                </h2>
-
-                {?post_excerpt}
-                    <p class="mt-4 mb-0 {template_classes.search_item_excerpt|s}">
-                        {post_excerpt|httml}
-                    </p>
-                {/post_excerpt}
+
+                <div>
+                    <h2 class="h5 mt-4 mb-0 searcwh-item__title">
+                        <a href="{permalink|url}" class="">
+                            {post_title|html}
+                        </a>
+                    </h2>
+
+                    {?post_excerpt}
+                        <p class="mt-4 mb-0 {template_classes.search_item_excerpt|attr}">
+                            {post_excerpt|html}
+                        </p>
+                    {/post_excerpt}
+                </div>
+
+                <div>
+                    {?breadcrumbs}
+                        <div class="search-item__meta-container has-text-weight-medium">
+                            <span class="is-sr-only">{Strings.s.search.breadcrumbs|html} </span>
+                            <div class="breadcrumb">
+                                <ul class="breadcrumbs__nav is-relative is-flex m-0 p-0 is-family-secondary">
+                                    {#breadcrumbs}
+                                        <li class="{?is_active}is-active{/is_active} {?class}{class|attr}{/class}">
+                                            {?permalink}
+                                                <span {?is_active}aria-current="page"{/is_active} class="ml-0">
+                                                    {?title}
+                                                        {title|html}
+                                                    {/title}
+
+                                                    {?icon}
+                                                        {>"ui/icon" class="icon--small" /}
+                                                    {/icon}
+                                                </span>
+                                            {:else}
+                                                <span {?is_active}aria-current="page"{/is_active}>
+                                                    {?title}
+                                                        {title|html}
+                                                    {/title}
+                                                </span>
+                                            {/permalink}
+                                        </li>
+                                    {/breadcrumbs}
+                                </ul>
+                            </div>
+                        </div>
+                    {/breadcrumbs}
+
+                    {?meta}
+                        <div class="search-item__meta-container has-text-weight-medium">
+                            {>"views/search/search-item-meta"  /}
+                        </div>
+                    {/meta}
+                </div>
+
             </div>
         </div>
     {/results.posts}
diff --git a/style.css b/style.css
index ae000671..ae51728d 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
  * Theme Name:  TMS Theme Tredu
  * Description: Tampere Multisite Tredu Theme
  * Domain Path: /lang
- * Version:     1.8.5
+ * Version:     1.8.8
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Text Domain: tms-theme-tredu