diff --git a/public/modules/custom/helfi_kasko_content/src/Plugin/views/filter/SchoolDetailsBase.php b/public/modules/custom/helfi_kasko_content/src/Plugin/views/filter/SchoolDetailsBase.php
index 541b6589..04e350da 100644
--- a/public/modules/custom/helfi_kasko_content/src/Plugin/views/filter/SchoolDetailsBase.php
+++ b/public/modules/custom/helfi_kasko_content/src/Plugin/views/filter/SchoolDetailsBase.php
@@ -93,7 +93,7 @@ protected function queryByWordId(int $wordId) {
       $this->query->addWhere('AND', 'di.detail_items_schoolyear', $schoolYear);
     }
 
-    $this->query->addWhere('AND', 'di.detail_items_clarification', $this->value);
+    $this->query->addWhere('AND', 'di.detail_items_clarification', $this->value, 'IN');
   }
 
   /**
diff --git a/public/themes/custom/hdbt_subtheme/dist/js/high-school-search.min.js b/public/themes/custom/hdbt_subtheme/dist/js/high-school-search.min.js
index 95cd5f51..0adad9ec 100644
--- a/public/themes/custom/hdbt_subtheme/dist/js/high-school-search.min.js
+++ b/public/themes/custom/hdbt_subtheme/dist/js/high-school-search.min.js
@@ -1 +1 @@
-(()=>{var e=Object.defineProperty;var t=(t,a)=>e(t,"name",{value:a,configurable:true});(Drupal=>{Drupal.behaviors.HighSchoolSearch={attach:t(function e(a){const s=t((e,t)=>{const a=e.nextElementSibling;if(t){a.textContent=Drupal.t('Filter on the form has been selected and some of the other filters might be dimmed because of your selection. To use the filters that were dimmed, select the option "All" on the selected filter.');e.parentElement?.classList.add("hdbt--select-wrapper--disabled");e.disabled=true;e.dataset.ariaDisabled="true"}else{a.textContent="";e.parentElement?.classList.remove("hdbt--select-wrapper--disabled");e.disabled=false;e.dataset.ariaDisabled="false"}},"toggleSelectActivity");const l=t((e,t)=>{if(e.value!=="All"){t.forEach(t=>s(t,t!==e))}else{t.forEach(t=>{if(t!==e){s(t,false)}})}},"disableOtherSelects");const i=a.querySelectorAll(".unit-search--high-school .js-form-item-emphasis .form-select, .unit-search--high-school .js-form-item-mission .form-select");i.forEach(e=>l(e,i));i.forEach(e=>{e.addEventListener("change",()=>l(e,i))})},"attach")}})(Drupal)})();
\ No newline at end of file
+(()=>{var e=Object.defineProperty;var t=(t,s)=>e(t,"name",{value:s,configurable:true});(Drupal=>{Drupal.behaviors.HighSchoolSearch={attach:t(function e(s){const l=t((e,t)=>{const s=e.nextElementSibling;if(t){s.textContent=Drupal.t('Filter on the form has been selected and some of the other filters might be dimmed because of your selection. To use the filters that were dimmed, select the option "All" on the selected filter.');e.parentElement?.classList.add("hdbt--select-wrapper--disabled");e.classList.add("disabled","noclick");e.value="All";e.setAttribute("aria-disabled","true")}else{s.textContent="";e.classList.remove("disabled","noclick");e.parentElement?.classList.remove("hdbt--select-wrapper--disabled");e.setAttribute("aria-disabled","false")}},"toggleSelectActivity");const a=t((e,t)=>{if(e.value!=="All"){t.forEach(t=>l(t,t!==e))}else{t.forEach(t=>{if(t!==e){l(t,false)}})}},"disableOtherSelects");const i=s.querySelectorAll(".unit-search--high-school .js-form-item-emphasis .form-select, .unit-search--high-school .js-form-item-mission .form-select");i.forEach(e=>a(e,i));i.forEach(e=>{e.addEventListener("change",()=>a(e,i))})},"attach")}})(Drupal)})();
\ No newline at end of file
diff --git a/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js b/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js
index 98a8a668..27eafd3e 100644
--- a/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js
+++ b/public/themes/custom/hdbt_subtheme/src/js/high-school-search.js
@@ -11,18 +11,21 @@
               'filters that were dimmed, select the option "All" on the selected filter.',
           );
           select.parentElement?.classList.add('hdbt--select-wrapper--disabled');
-          select.disabled = true;
-          select.dataset.ariaDisabled = 'true';
+
+          // Disabling the field by `select.disabled=true` interferes with ajax.
+          select.classList.add('disabled', 'noclick');
+          select.value = 'All';
+          select.setAttribute('aria-disabled', 'true');
         } else {
           helpText.textContent = '';
+
+          select.classList.remove('disabled', 'noclick');
           select.parentElement?.classList.remove('hdbt--select-wrapper--disabled');
-          select.disabled = false;
-          select.dataset.ariaDisabled = 'false';
+          select.setAttribute('aria-disabled', 'false');
         }
       };
 
-      // Disable all other selects except the one that has some OTHER option selected
-      // than 'All' and enable them all if they all have 'All' option selected.
+      // Only one of the two emphasis fields may be selected.
       const disableOtherSelects = (selected, selectElements) => {
         if (selected.value !== 'All') {
           /** biome-ignore lint/suspicious/useIterableCallbackReturn: @todo UHF-12501 */