diff --git a/js/expand-info.js b/js/expand-info.js
index 43f9b9b..b1ae8da 100644
--- a/js/expand-info.js
+++ b/js/expand-info.js
@@ -27,27 +27,27 @@ document.querySelector('.expandAll').onclick = function (e) {
   if (all_status == "hide") {
     obj.setAttribute("collapse-status", "show");
     obj.querySelector(".expandAllText").innerHTML = "Collapse All";
-    obj.parentNode.querySelectorAll(".tourDatesBJ span[id$='Icon']").forEach(function (icon, i) {
+    obj.parentNode.querySelectorAll("div[collapse] span[id$='Icon']").forEach(function (icon, i) {
       icon.classList.remove('OpenIcon');
       icon.classList.add('CloseIcon');
     });
-    obj.parentNode.querySelectorAll(".ItineraryContent").forEach(function (itinerary, i) {
+    obj.parentNode.querySelectorAll("div[collapse-content]").forEach(function (itinerary, i) {
       slideDown(itinerary);
     });
-    obj.parentNode.querySelectorAll(".tourDatesBJ").forEach(function (title, i) {
+    obj.parentNode.querySelectorAll("div[collapse]").forEach(function (title, i) {
       title.setAttribute("collapse-status", "show");
     });
   } else {
     obj.setAttribute("collapse-status", "hide");
     obj.querySelector(".expandAllText").innerHTML = "Expand All";
-    obj.parentNode.querySelectorAll(".tourDatesBJ span[id$='Icon']").forEach(function (icon, i) {
+    obj.parentNode.querySelectorAll("div[collapse] span[id$='Icon']").forEach(function (icon, i) {
       icon.classList.remove('CloseIcon');
       icon.classList.add('OpenIcon');
     });
-    obj.parentNode.querySelectorAll(".ItineraryContent").forEach(function (itinerary, i) {
+    obj.parentNode.querySelectorAll("div[collapse-content]").forEach(function (itinerary, i) {
       slideUp(itinerary);
     });
-    obj.parentNode.querySelectorAll(".tourDatesBJ").forEach(function (title, i) {
+    obj.parentNode.querySelectorAll("div[collapse]").forEach(function (title, i) {
       title.setAttribute("collapse-status", "hide");
     });
   }