diff --git a/Frontend/tools/xpath.html b/Frontend/tools/xpath.html
index 457ff1e..cf21fe5 100644
--- a/Frontend/tools/xpath.html
+++ b/Frontend/tools/xpath.html
@@ -1245,7 +1245,9 @@
                     </div>
                 </div>
                 <div class="collapsible">
-                    <button class="section-button collapseTrigger" style="border: none">Collections</button>
+                    <span name="collapse20">
+                        <button class="section-button collapseTrigger" style="border: none">Collections</button>
+                    </span>
                     <div class="content">
 
                         <span name="collapse20">
@@ -1699,7 +1701,9 @@
                     </div>
                 </div>
                 <div class="collapsible">
-                    <button class="section-button collapseTrigger" style="border: none">Date / Time</button>
+                    <span name="collapse20">
+                        <button class="section-button collapseTrigger" style="border: none">Date / Time</button>
+                    </span>
                     <div class="content">
 
                         <span name="collapse20">
@@ -2603,7 +2607,9 @@
                     </div>
                 </div>
                 <div class="collapsible">
+                    <span name="collapse20">
                     <button class="section-button collapseTrigger" style="border: none">Error</button>
+                    </span>
                     <div class="content">
 
                         <span name="collapse20">
@@ -2670,7 +2676,9 @@
                     </div>
                 </div>
                 <div class="collapsible">
-                    <button class="section-button collapseTrigger" style="border: none">Misc</button>
+                    <span name="collapse20">
+                        <button class="section-button collapseTrigger" style="border: none">Misc</button>
+                    </span>
                     <div class="content">
 
                         <span name="collapse20">
@@ -2991,7 +2999,8 @@
 
 
                     </div>
-                </div><span name="collapse30">
+                </div>
+                <span name="collapse30">
                     <div class="collapsible">
                         <button class="section-button collapseTrigger" style="border: none">Loop /
                             Conditional</button>
@@ -3101,18 +3110,28 @@
 
 
             if (filter == "collapse3.0") {
-                showList(document.getElementsByName("collapse30"));
                 document.getElementById("tooltipFunctionInfo").innerText = "XPath 1.0, 2.0 & 3.0 functions";
-                // hideList(document.getElementsByName("collapse31"));
+                showList(document.getElementsByName("collapse20"));
+                showList(document.getElementsByName("collapse30"));
+                hideList(document.getElementsByName("collapse31"));
                 console.log("collapsed 3.0");
             } else if (filter == "collapse3.1") {
-                showList(document.getElementsByName("collapse31"));
                 document.getElementById("tooltipFunctionInfo").innerText = "XPath 1.0, 2.0, 3.0 & 3.1 functions";
+                showList(document.getElementsByName("collapse20"));
+                showList(document.getElementsByName("collapse30"));
+                showList(document.getElementsByName("collapse31"));
                 console.log("collapsed 3.1");
-            } else {
+            } else if (filter == "collapse2.0"){
                 document.getElementById("tooltipFunctionInfo").innerText = "XPath 1.0 & 2.0 functions";
+                showList(document.getElementsByName("collapse20"));
                 hideList(document.getElementsByName("collapse30"));
                 hideList(document.getElementsByName("collapse31"));
+            } else {
+                document.getElementById("tooltipFunctionInfo").innerText = "XPath 1.0 functions";
+                hideList(document.getElementsByName("collapse20"));
+                hideList(document.getElementsByName("collapse30"));
+                hideList(document.getElementsByName("collapse31"));
+
             }
 
 
@@ -3194,14 +3213,14 @@
             setDefaultContent(document.getElementById("xmlArea"), 'Insert XML here');
             setDefaultContent(document.getElementById("transformArea"), 'Insert XPath expression here');
             console.log("init");
-            processTooltip();
             processVersionSelector();
+            processTooltip();
             tool.addEventListener('change', event => {
                 //Check if script was called from textarea or selector
                 var targetID = event.target.getAttribute('id');
                 if (targetID == "processors") {
-                    processTooltip();
                     processVersionSelector();
+                    processTooltip();
                 }
                 else if (targetID == "versions") {
                     processTooltip();