diff --git a/js/attributes.js b/js/attributes.js
index 3b11bf3f8aa5ce251dc8ef4f6cc69d2b1de9d01e..00ee9853e9b334fc7c89da27396ccbdafb4121d9 100644
--- a/js/attributes.js
+++ b/js/attributes.js
@@ -346,7 +346,7 @@
       identifier = identifier.replace('__', '#DOUBLE_UNDERSCORE#', identifier);
     }
 
-    identifier = identifier.replace(Object.keys(filter), Object.values(filter), identifier);
+    identifier = identifier.replace(Object.keys(filter), Object.keys(filter).map(function(key) { return filter[key]; }), identifier);
 
     if (filter['__'] === void 0) {
       identifier = identifier.replace('#DOUBLE_UNDERSCORE#', '__', identifier);
diff --git a/js/modal.jquery.ui.bridge.js b/js/modal.jquery.ui.bridge.js
index 250f986d2e4198ada4de315009f41db257a0f506..88d5ce480be5298a7c60f4c249f1f394202635f2 100644
--- a/js/modal.jquery.ui.bridge.js
+++ b/js/modal.jquery.ui.bridge.js
@@ -472,7 +472,7 @@
         attributes[button.disabled ? 'set' :'remove']('disabled', 'disabled');
 
         if (button.classes) {
-          attributes.addClass(Object.values(button.classes));
+          attributes.addClass(Object.keys(button.classes).map(function(key) { return button.classes[key]; }));
         }
         if (button['class']) {
           attributes.addClass(button['class']);