diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index 7415b552..a961db98 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -150,8 +150,7 @@ function initTable() {
         })
         .selectpicker()
         .siblings(".dropdown-menu")
-        .find(".btn-group")
-        .parent()
+        .find(".bs-actionsbox")
         .prepend(
           '<button type="button" id=btn_apply_' +
             data.id +
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 66604d5c..803c4c3f 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -188,8 +188,7 @@ function initTable() {
         })
         .selectpicker()
         .siblings(".dropdown-menu")
-        .find(".btn-group")
-        .parent()
+        .find(".bs-actionsbox")
         .prepend(
           '<button type="button" id=btn_apply_' +
             data.id +
diff --git a/scripts/pi-hole/js/groups-common.js b/scripts/pi-hole/js/groups-common.js
index 903d5a43..99756901 100644
--- a/scripts/pi-hole/js/groups-common.js
+++ b/scripts/pi-hole/js/groups-common.js
@@ -138,6 +138,8 @@ function bsSelect_defaults() {
   pickerDEFAULTS.width = "fit";
   pickerDEFAULTS.container = "body";
   pickerDEFAULTS.dropdownAlignRight = "auto";
+  pickerDEFAULTS.selectAllText = "All";
+  pickerDEFAULTS.deselectAllText = "None";
   pickerDEFAULTS.countSelectedText = function(num, total) {
     if (num === total) {
       return "All selected (" + num + ")";
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 20c22eab..92717262 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -215,8 +215,7 @@ function initTable() {
           })
           .selectpicker()
           .siblings(".dropdown-menu")
-          .find(".btn-group")
-          .parent()
+          .find(".bs-actionsbox")
           .prepend(
             '<button type="button" id=btn_apply_' +
               data.id +