diff --git a/ckanext/odsh/assets/bootstrap-multiselect.js b/ckanext/odsh/assets/bootstrap-multiselect.js
index 10ece14647d0b3d8a4618eabfd2a50611985d356..5a3bf861ac95c04251554cbca545057da74b68b4 100644
--- a/ckanext/odsh/assets/bootstrap-multiselect.js
+++ b/ckanext/odsh/assets/bootstrap-multiselect.js
@@ -461,7 +461,7 @@
 
             },
             enableHTML: false,
-            buttonClass: 'btn btn-default',
+            buttonClass: 'form-select',
             inheritClass: false,
             buttonWidth: 'auto',
             buttonContainer: '<div class="btn-group" />',
@@ -500,7 +500,7 @@
             includeResetDivider: false,
             resetText: 'Reset',
             templates: {
-                button: '<button type="button" class="multiselect dropdown-toggle" data-toggle="dropdown"><span class="multiselect-selected-text"></span> <b class="caret"></b></button>',
+                button: '<button type="button" class="multiselect dropdown-toggle" data-bs-toggle="dropdown"><span class="multiselect-selected-text"></span> <b class="caret"></b></button>',
                 ul: '<ul class="multiselect-container dropdown-menu"></ul>',
                 filter: '<li class="multiselect-item multiselect-filter"><div class="input-group"><span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span><input class="form-control multiselect-search" type="text" /></div></li>',
                 filterClearBtn: '<span class="input-group-btn"><button class="btn btn-default multiselect-clear-filter" type="button"><i class="glyphicon glyphicon-remove-circle"></i></button></span>',
diff --git a/ckanext/odsh/assets/odsh.css b/ckanext/odsh/assets/odsh.css
index b0bf421862c26e9df666473aaadcc8d9f2b5c23a..fc32a357d990bc682709db9bf5cbc8b4126bc358 100644
--- a/ckanext/odsh/assets/odsh.css
+++ b/ckanext/odsh/assets/odsh.css
@@ -2697,6 +2697,14 @@ p.package-info-issued {
   margin-right: 5px;
 }
 
+.multiselect-container li > a {
+  display: block;
+}
+
+.multiselect-container > li.active > a > label {
+  color: white;
+}
+
 .control-group.error .multiselect-container>li>a>label {
   color: var(--odsh-color-sh-blue);
 }
@@ -2760,6 +2768,7 @@ p.package-info-issued {
 .dropdown-submenu:hover>a,
 .dropdown-submenu:focus>a {
   background-color: var(--odsh-color-sh-blue);
+  color: white !important;
   background-image: none;
 }