commit 258bbf2868fb60b94cbddc821d83d3fbbe6aeffc
author Eclipse Ditto Bot <ditto-bot@eclipse.org> Fri Jan 31 14:43:40 2020 +0000
committer Eclipse Ditto Bot <ditto-bot@eclipse.org> Fri Jan 31 14:43:40 2020 +0000
tree c22092db016e70da88ad3d82a10b35f7ca2ec973
parent d85608bf7fa9b9f99891d6956f7ce1ac8cfab639

updated project site -- build no: 12 -- another try to fix doc version for real

1.0/404.html

diff --git a/1.0/404.html b/1.0/404.html
index 7eb52ac..f9fb5f8 100644
--- a/1.0/404.html
+++ b/1.0/404.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-overview.html

diff --git a/1.0/architecture-overview.html b/1.0/architecture-overview.html
index 1c2f65e..9d30e3f 100644
--- a/1.0/architecture-overview.html
+++ b/1.0/architecture-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-services-concierge.html

diff --git a/1.0/architecture-services-concierge.html b/1.0/architecture-services-concierge.html
index 82a60de..cbe241b 100644
--- a/1.0/architecture-services-concierge.html
+++ b/1.0/architecture-services-concierge.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-services-connectivity.html

diff --git a/1.0/architecture-services-connectivity.html b/1.0/architecture-services-connectivity.html
index 9a48167..be52a0a 100644
--- a/1.0/architecture-services-connectivity.html
+++ b/1.0/architecture-services-connectivity.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-services-gateway.html

diff --git a/1.0/architecture-services-gateway.html b/1.0/architecture-services-gateway.html
index c32702b..f0c60da 100644
--- a/1.0/architecture-services-gateway.html
+++ b/1.0/architecture-services-gateway.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-services-policies.html

diff --git a/1.0/architecture-services-policies.html b/1.0/architecture-services-policies.html
index 9834890..eda3dc3 100644
--- a/1.0/architecture-services-policies.html
+++ b/1.0/architecture-services-policies.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-services-things-search.html

diff --git a/1.0/architecture-services-things-search.html b/1.0/architecture-services-things-search.html
index 8f0101c..780cbf1 100644
--- a/1.0/architecture-services-things-search.html
+++ b/1.0/architecture-services-things-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/architecture-services-things.html

diff --git a/1.0/architecture-services-things.html b/1.0/architecture-services-things.html
index 4973233..bee6ef1 100644
--- a/1.0/architecture-services-things.html
+++ b/1.0/architecture-services-things.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-acl.html

diff --git a/1.0/basic-acl.html b/1.0/basic-acl.html
index 10cbf84..e629817 100644
--- a/1.0/basic-acl.html
+++ b/1.0/basic-acl.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-apis.html

diff --git a/1.0/basic-apis.html b/1.0/basic-apis.html
index 6a8bdde..178f3f4 100644
--- a/1.0/basic-apis.html
+++ b/1.0/basic-apis.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-auth.html

diff --git a/1.0/basic-auth.html b/1.0/basic-auth.html
index ec1634c..fd2caa2 100644
--- a/1.0/basic-auth.html
+++ b/1.0/basic-auth.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-changenotifications.html

diff --git a/1.0/basic-changenotifications.html b/1.0/basic-changenotifications.html
index 96ee5fd..ef6efb1 100644
--- a/1.0/basic-changenotifications.html
+++ b/1.0/basic-changenotifications.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-connections.html

diff --git a/1.0/basic-connections.html b/1.0/basic-connections.html
index 2964b39..d729f44 100644
--- a/1.0/basic-connections.html
+++ b/1.0/basic-connections.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-feature.html

diff --git a/1.0/basic-feature.html b/1.0/basic-feature.html
index 613cc43..79756a9 100644
--- a/1.0/basic-feature.html
+++ b/1.0/basic-feature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-messages.html

diff --git a/1.0/basic-messages.html b/1.0/basic-messages.html
index 43fbd66..2bf9499 100644
--- a/1.0/basic-messages.html
+++ b/1.0/basic-messages.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-namespaces-and-names.html

diff --git a/1.0/basic-namespaces-and-names.html b/1.0/basic-namespaces-and-names.html
index 253b1fa..49b63b9 100644
--- a/1.0/basic-namespaces-and-names.html
+++ b/1.0/basic-namespaces-and-names.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-overview.html

diff --git a/1.0/basic-overview.html b/1.0/basic-overview.html
index b843c03..cb9f199 100644
--- a/1.0/basic-overview.html
+++ b/1.0/basic-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-placeholders.html

diff --git a/1.0/basic-placeholders.html b/1.0/basic-placeholders.html
index edb5d5d..4d7c26f 100644
--- a/1.0/basic-placeholders.html
+++ b/1.0/basic-placeholders.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-policy.html

diff --git a/1.0/basic-policy.html b/1.0/basic-policy.html
index bdb8200..201f783 100644
--- a/1.0/basic-policy.html
+++ b/1.0/basic-policy.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-rql.html

diff --git a/1.0/basic-rql.html b/1.0/basic-rql.html
index c40ae9b..a9a2206 100644
--- a/1.0/basic-rql.html
+++ b/1.0/basic-rql.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-search.html

diff --git a/1.0/basic-search.html b/1.0/basic-search.html
index 9b24799..2de52c5 100644
--- a/1.0/basic-search.html
+++ b/1.0/basic-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-signals-command.html

diff --git a/1.0/basic-signals-command.html b/1.0/basic-signals-command.html
index 8e9f02c..4147a27 100644
--- a/1.0/basic-signals-command.html
+++ b/1.0/basic-signals-command.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-signals-commandresponse.html

diff --git a/1.0/basic-signals-commandresponse.html b/1.0/basic-signals-commandresponse.html
index c15525b..b9cc0d9 100644
--- a/1.0/basic-signals-commandresponse.html
+++ b/1.0/basic-signals-commandresponse.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-signals-errorresponse.html

diff --git a/1.0/basic-signals-errorresponse.html b/1.0/basic-signals-errorresponse.html
index 6608c62..206ac9b 100644
--- a/1.0/basic-signals-errorresponse.html
+++ b/1.0/basic-signals-errorresponse.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-signals-event.html

diff --git a/1.0/basic-signals-event.html b/1.0/basic-signals-event.html
index 5d7edbf..d90ac83 100644
--- a/1.0/basic-signals-event.html
+++ b/1.0/basic-signals-event.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-signals.html

diff --git a/1.0/basic-signals.html b/1.0/basic-signals.html
index d84fb10..fbacc61 100644
--- a/1.0/basic-signals.html
+++ b/1.0/basic-signals.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/basic-thing.html

diff --git a/1.0/basic-thing.html b/1.0/basic-thing.html
index 0efbd7a..1657940 100644
--- a/1.0/basic-thing.html
+++ b/1.0/basic-thing.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/client-sdk-java.html

diff --git a/1.0/client-sdk-java.html b/1.0/client-sdk-java.html
index 478b164..bbc87fb 100644
--- a/1.0/client-sdk-java.html
+++ b/1.0/client-sdk-java.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/client-sdk-javascript.html

diff --git a/1.0/client-sdk-javascript.html b/1.0/client-sdk-javascript.html
index 76fd3a0..2dbb779 100644
--- a/1.0/client-sdk-javascript.html
+++ b/1.0/client-sdk-javascript.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/client-sdk-overview.html

diff --git a/1.0/client-sdk-overview.html b/1.0/client-sdk-overview.html
index 59e5da3..cfe6686 100644
--- a/1.0/client-sdk-overview.html
+++ b/1.0/client-sdk-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-header-mapping.html

diff --git a/1.0/connectivity-header-mapping.html b/1.0/connectivity-header-mapping.html
index ffae705..e2e419d 100644
--- a/1.0/connectivity-header-mapping.html
+++ b/1.0/connectivity-header-mapping.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-manage-connections.html

diff --git a/1.0/connectivity-manage-connections.html b/1.0/connectivity-manage-connections.html
index 1e22ed0..4c4bb30 100644
--- a/1.0/connectivity-manage-connections.html
+++ b/1.0/connectivity-manage-connections.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-mapping.html

diff --git a/1.0/connectivity-mapping.html b/1.0/connectivity-mapping.html
index 6d4bb43..dd02df2 100644
--- a/1.0/connectivity-mapping.html
+++ b/1.0/connectivity-mapping.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-overview.html

diff --git a/1.0/connectivity-overview.html b/1.0/connectivity-overview.html
index abaefd1..7c90870 100644
--- a/1.0/connectivity-overview.html
+++ b/1.0/connectivity-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-protocol-bindings-amqp091.html

diff --git a/1.0/connectivity-protocol-bindings-amqp091.html b/1.0/connectivity-protocol-bindings-amqp091.html
index 438985e..a24374d 100644
--- a/1.0/connectivity-protocol-bindings-amqp091.html
+++ b/1.0/connectivity-protocol-bindings-amqp091.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-protocol-bindings-amqp10.html

diff --git a/1.0/connectivity-protocol-bindings-amqp10.html b/1.0/connectivity-protocol-bindings-amqp10.html
index fd3be66..485cccb 100644
--- a/1.0/connectivity-protocol-bindings-amqp10.html
+++ b/1.0/connectivity-protocol-bindings-amqp10.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-protocol-bindings-http.html

diff --git a/1.0/connectivity-protocol-bindings-http.html b/1.0/connectivity-protocol-bindings-http.html
index c7db597..f94e4e2 100644
--- a/1.0/connectivity-protocol-bindings-http.html
+++ b/1.0/connectivity-protocol-bindings-http.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-protocol-bindings-kafka2.html

diff --git a/1.0/connectivity-protocol-bindings-kafka2.html b/1.0/connectivity-protocol-bindings-kafka2.html
index b103c74..bbc4ed6 100644
--- a/1.0/connectivity-protocol-bindings-kafka2.html
+++ b/1.0/connectivity-protocol-bindings-kafka2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-protocol-bindings-mqtt.html

diff --git a/1.0/connectivity-protocol-bindings-mqtt.html b/1.0/connectivity-protocol-bindings-mqtt.html
index 6daad45..9f9476c 100644
--- a/1.0/connectivity-protocol-bindings-mqtt.html
+++ b/1.0/connectivity-protocol-bindings-mqtt.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/connectivity-tls-certificates.html

diff --git a/1.0/connectivity-tls-certificates.html b/1.0/connectivity-tls-certificates.html
index 51aceef..427f33c 100644
--- a/1.0/connectivity-tls-certificates.html
+++ b/1.0/connectivity-tls-certificates.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/feed.xml

diff --git a/1.0/feed.xml b/1.0/feed.xml
index 0653cfe..aae1464 100644
--- a/1.0/feed.xml
+++ b/1.0/feed.xml
@@ -5,8 +5,8 @@
         <description>Announcements, tutorials and examples around Eclipse Ditto and Digital Twins</description>
         <link>https://www.eclipse.org/ditto/</link>
         <atom:link href="https://www.eclipse.org/ditto/feed.xml" rel="self" type="application/rss+xml"/>
-        <pubDate>Fri, 31 Jan 2020 13:48:42 +0000</pubDate>
-        <lastBuildDate>Fri, 31 Jan 2020 13:48:42 +0000</lastBuildDate>
+        <pubDate>Fri, 31 Jan 2020 14:42:42 +0000</pubDate>
+        <lastBuildDate>Fri, 31 Jan 2020 14:42:42 +0000</lastBuildDate>
         <generator>Jekyll v3.6.2</generator>
         
         <item>

1.0/feedback.html

diff --git a/1.0/feedback.html b/1.0/feedback.html
index 673bf48..2d7f899 100644
--- a/1.0/feedback.html
+++ b/1.0/feedback.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/glossary.html

diff --git a/1.0/glossary.html b/1.0/glossary.html
index 5a535f6..5b04161 100644
--- a/1.0/glossary.html
+++ b/1.0/glossary.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-concepts.html

diff --git a/1.0/httpapi-concepts.html b/1.0/httpapi-concepts.html
index 865c2ac..fcf3575 100644
--- a/1.0/httpapi-concepts.html
+++ b/1.0/httpapi-concepts.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-messages.html

diff --git a/1.0/httpapi-messages.html b/1.0/httpapi-messages.html
index 52e011a..3ab7df9 100644
--- a/1.0/httpapi-messages.html
+++ b/1.0/httpapi-messages.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-overview.html

diff --git a/1.0/httpapi-overview.html b/1.0/httpapi-overview.html
index 81d3121..0a15c71 100644
--- a/1.0/httpapi-overview.html
+++ b/1.0/httpapi-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-postman.html

diff --git a/1.0/httpapi-postman.html b/1.0/httpapi-postman.html
index a5c3702..0bc80f5 100644
--- a/1.0/httpapi-postman.html
+++ b/1.0/httpapi-postman.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-protocol-bindings-websocket.html

diff --git a/1.0/httpapi-protocol-bindings-websocket.html b/1.0/httpapi-protocol-bindings-websocket.html
index c7a86b9..8ee817c 100644
--- a/1.0/httpapi-protocol-bindings-websocket.html
+++ b/1.0/httpapi-protocol-bindings-websocket.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-search.html

diff --git a/1.0/httpapi-search.html b/1.0/httpapi-search.html
index cd6ec89..d122ede 100644
--- a/1.0/httpapi-search.html
+++ b/1.0/httpapi-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/httpapi-sse.html

diff --git a/1.0/httpapi-sse.html b/1.0/httpapi-sse.html
index e317099..18d09d4 100644
--- a/1.0/httpapi-sse.html
+++ b/1.0/httpapi-sse.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/installation-building.html

diff --git a/1.0/installation-building.html b/1.0/installation-building.html
index 18d9a7f..51b4a4b 100644
--- a/1.0/installation-building.html
+++ b/1.0/installation-building.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/installation-operating.html

diff --git a/1.0/installation-operating.html b/1.0/installation-operating.html
index 3e13f69..2c6f2a5 100644
--- a/1.0/installation-operating.html
+++ b/1.0/installation-operating.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/installation-running.html

diff --git a/1.0/installation-running.html b/1.0/installation-running.html
index 5995ebd..6feb15e 100644
--- a/1.0/installation-running.html
+++ b/1.0/installation-running.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/intro-digitaltwins.html

diff --git a/1.0/intro-digitaltwins.html b/1.0/intro-digitaltwins.html
index 6165766..efabc5b 100644
--- a/1.0/intro-digitaltwins.html
+++ b/1.0/intro-digitaltwins.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/intro-hello-world.html

diff --git a/1.0/intro-hello-world.html b/1.0/intro-hello-world.html
index 1ab4736..feb45d8 100644
--- a/1.0/intro-hello-world.html
+++ b/1.0/intro-hello-world.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/intro-overview.html

diff --git a/1.0/intro-overview.html b/1.0/intro-overview.html
index 4929045..a6d3e7b 100644
--- a/1.0/intro-overview.html
+++ b/1.0/intro-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/presentations.html

diff --git a/1.0/presentations.html b/1.0/presentations.html
index dbc460a..707cd09 100644
--- a/1.0/presentations.html
+++ b/1.0/presentations.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-bindings.html

diff --git a/1.0/protocol-bindings.html b/1.0/protocol-bindings.html
index 8073c73..413c626 100644
--- a/1.0/protocol-bindings.html
+++ b/1.0/protocol-bindings.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createattribute.html

diff --git a/1.0/protocol-examples-createattribute.html b/1.0/protocol-examples-createattribute.html
index 9d3c921..af8a103 100644
--- a/1.0/protocol-examples-createattribute.html
+++ b/1.0/protocol-examples-createattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createattributes.html

diff --git a/1.0/protocol-examples-createattributes.html b/1.0/protocol-examples-createattributes.html
index ec20c6e..538437d 100644
--- a/1.0/protocol-examples-createattributes.html
+++ b/1.0/protocol-examples-createattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createdefinition.html

diff --git a/1.0/protocol-examples-createdefinition.html b/1.0/protocol-examples-createdefinition.html
index 559590e..8c73923 100644
--- a/1.0/protocol-examples-createdefinition.html
+++ b/1.0/protocol-examples-createdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createfeature.html

diff --git a/1.0/protocol-examples-createfeature.html b/1.0/protocol-examples-createfeature.html
index 875ad92..9e4ef6d 100644
--- a/1.0/protocol-examples-createfeature.html
+++ b/1.0/protocol-examples-createfeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createfeatures.html

diff --git a/1.0/protocol-examples-createfeatures.html b/1.0/protocol-examples-createfeatures.html
index fb740d6..b8d48e6 100644
--- a/1.0/protocol-examples-createfeatures.html
+++ b/1.0/protocol-examples-createfeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createproperties.html

diff --git a/1.0/protocol-examples-createproperties.html b/1.0/protocol-examples-createproperties.html
index e116663..815fca4 100644
--- a/1.0/protocol-examples-createproperties.html
+++ b/1.0/protocol-examples-createproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createproperty.html

diff --git a/1.0/protocol-examples-createproperty.html b/1.0/protocol-examples-createproperty.html
index 12e0cd8..4b537d4 100644
--- a/1.0/protocol-examples-createproperty.html
+++ b/1.0/protocol-examples-createproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-creatething.html

diff --git a/1.0/protocol-examples-creatething.html b/1.0/protocol-examples-creatething.html
index 0beaeaf..0a4ffc2 100644
--- a/1.0/protocol-examples-creatething.html
+++ b/1.0/protocol-examples-creatething.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-createthingdefinition.html

diff --git a/1.0/protocol-examples-createthingdefinition.html b/1.0/protocol-examples-createthingdefinition.html
index 4ebf272..3d82164 100644
--- a/1.0/protocol-examples-createthingdefinition.html
+++ b/1.0/protocol-examples-createthingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deleteattribute.html

diff --git a/1.0/protocol-examples-deleteattribute.html b/1.0/protocol-examples-deleteattribute.html
index c87a988..90a0411 100644
--- a/1.0/protocol-examples-deleteattribute.html
+++ b/1.0/protocol-examples-deleteattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deleteattributes.html

diff --git a/1.0/protocol-examples-deleteattributes.html b/1.0/protocol-examples-deleteattributes.html
index f3e0003..338005b 100644
--- a/1.0/protocol-examples-deleteattributes.html
+++ b/1.0/protocol-examples-deleteattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deletedefinition.html

diff --git a/1.0/protocol-examples-deletedefinition.html b/1.0/protocol-examples-deletedefinition.html
index e938eb9..8c7c5fd 100644
--- a/1.0/protocol-examples-deletedefinition.html
+++ b/1.0/protocol-examples-deletedefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deletefeature.html

diff --git a/1.0/protocol-examples-deletefeature.html b/1.0/protocol-examples-deletefeature.html
index 17e3098..4327b9b 100644
--- a/1.0/protocol-examples-deletefeature.html
+++ b/1.0/protocol-examples-deletefeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deletefeatures.html

diff --git a/1.0/protocol-examples-deletefeatures.html b/1.0/protocol-examples-deletefeatures.html
index 1addf7d..5ba46f8 100644
--- a/1.0/protocol-examples-deletefeatures.html
+++ b/1.0/protocol-examples-deletefeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deleteproperties.html

diff --git a/1.0/protocol-examples-deleteproperties.html b/1.0/protocol-examples-deleteproperties.html
index bd6f829..1eb8eb1 100644
--- a/1.0/protocol-examples-deleteproperties.html
+++ b/1.0/protocol-examples-deleteproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deleteproperty.html

diff --git a/1.0/protocol-examples-deleteproperty.html b/1.0/protocol-examples-deleteproperty.html
index 14bcba7..93ebb98 100644
--- a/1.0/protocol-examples-deleteproperty.html
+++ b/1.0/protocol-examples-deleteproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deletething.html

diff --git a/1.0/protocol-examples-deletething.html b/1.0/protocol-examples-deletething.html
index 7d571c5..a29619d 100644
--- a/1.0/protocol-examples-deletething.html
+++ b/1.0/protocol-examples-deletething.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-deletethingdefinition.html

diff --git a/1.0/protocol-examples-deletethingdefinition.html b/1.0/protocol-examples-deletethingdefinition.html
index 2367bea..da889da 100644
--- a/1.0/protocol-examples-deletethingdefinition.html
+++ b/1.0/protocol-examples-deletethingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-errorresponses.html

diff --git a/1.0/protocol-examples-errorresponses.html b/1.0/protocol-examples-errorresponses.html
index 5db90a4..c874930 100644
--- a/1.0/protocol-examples-errorresponses.html
+++ b/1.0/protocol-examples-errorresponses.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifyattribute.html

diff --git a/1.0/protocol-examples-modifyattribute.html b/1.0/protocol-examples-modifyattribute.html
index 118a803..cd03aa0 100644
--- a/1.0/protocol-examples-modifyattribute.html
+++ b/1.0/protocol-examples-modifyattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifyattributes.html

diff --git a/1.0/protocol-examples-modifyattributes.html b/1.0/protocol-examples-modifyattributes.html
index 99209dc..9d429fa 100644
--- a/1.0/protocol-examples-modifyattributes.html
+++ b/1.0/protocol-examples-modifyattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifydefinition.html

diff --git a/1.0/protocol-examples-modifydefinition.html b/1.0/protocol-examples-modifydefinition.html
index dec47e4..57f5d13 100644
--- a/1.0/protocol-examples-modifydefinition.html
+++ b/1.0/protocol-examples-modifydefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifyfeature.html

diff --git a/1.0/protocol-examples-modifyfeature.html b/1.0/protocol-examples-modifyfeature.html
index 949ba31..a6a6908 100644
--- a/1.0/protocol-examples-modifyfeature.html
+++ b/1.0/protocol-examples-modifyfeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifyfeatures.html

diff --git a/1.0/protocol-examples-modifyfeatures.html b/1.0/protocol-examples-modifyfeatures.html
index ffeefa1..b714ac7 100644
--- a/1.0/protocol-examples-modifyfeatures.html
+++ b/1.0/protocol-examples-modifyfeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifyproperties.html

diff --git a/1.0/protocol-examples-modifyproperties.html b/1.0/protocol-examples-modifyproperties.html
index 71d0897..79e86a4 100644
--- a/1.0/protocol-examples-modifyproperties.html
+++ b/1.0/protocol-examples-modifyproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifyproperty.html

diff --git a/1.0/protocol-examples-modifyproperty.html b/1.0/protocol-examples-modifyproperty.html
index 37b93dd..2b07f78 100644
--- a/1.0/protocol-examples-modifyproperty.html
+++ b/1.0/protocol-examples-modifyproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifything.html

diff --git a/1.0/protocol-examples-modifything.html b/1.0/protocol-examples-modifything.html
index 6f0a7e8..10b74cf 100644
--- a/1.0/protocol-examples-modifything.html
+++ b/1.0/protocol-examples-modifything.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-modifythingdefinition.html

diff --git a/1.0/protocol-examples-modifythingdefinition.html b/1.0/protocol-examples-modifythingdefinition.html
index 92fa7e2..7da6dc9 100644
--- a/1.0/protocol-examples-modifythingdefinition.html
+++ b/1.0/protocol-examples-modifythingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrieveattribute.html

diff --git a/1.0/protocol-examples-retrieveattribute.html b/1.0/protocol-examples-retrieveattribute.html
index 36e7c81..5730e8d 100644
--- a/1.0/protocol-examples-retrieveattribute.html
+++ b/1.0/protocol-examples-retrieveattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrieveattributes.html

diff --git a/1.0/protocol-examples-retrieveattributes.html b/1.0/protocol-examples-retrieveattributes.html
index afeaa00..eff001b 100644
--- a/1.0/protocol-examples-retrieveattributes.html
+++ b/1.0/protocol-examples-retrieveattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrievedefinition.html

diff --git a/1.0/protocol-examples-retrievedefinition.html b/1.0/protocol-examples-retrievedefinition.html
index e3e10e7..72d22d5 100644
--- a/1.0/protocol-examples-retrievedefinition.html
+++ b/1.0/protocol-examples-retrievedefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrievefeature.html

diff --git a/1.0/protocol-examples-retrievefeature.html b/1.0/protocol-examples-retrievefeature.html
index 3714fa8..63ca888 100644
--- a/1.0/protocol-examples-retrievefeature.html
+++ b/1.0/protocol-examples-retrievefeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrievefeatures.html

diff --git a/1.0/protocol-examples-retrievefeatures.html b/1.0/protocol-examples-retrievefeatures.html
index 13ebd05..2a7fdff 100644
--- a/1.0/protocol-examples-retrievefeatures.html
+++ b/1.0/protocol-examples-retrievefeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrieveproperties.html

diff --git a/1.0/protocol-examples-retrieveproperties.html b/1.0/protocol-examples-retrieveproperties.html
index b433bfe..ad32015 100644
--- a/1.0/protocol-examples-retrieveproperties.html
+++ b/1.0/protocol-examples-retrieveproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrieveproperty.html

diff --git a/1.0/protocol-examples-retrieveproperty.html b/1.0/protocol-examples-retrieveproperty.html
index 361585f..60de151 100644
--- a/1.0/protocol-examples-retrieveproperty.html
+++ b/1.0/protocol-examples-retrieveproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrievething.html

diff --git a/1.0/protocol-examples-retrievething.html b/1.0/protocol-examples-retrievething.html
index a1da209..353b0f3 100644
--- a/1.0/protocol-examples-retrievething.html
+++ b/1.0/protocol-examples-retrievething.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrievethingdefinition.html

diff --git a/1.0/protocol-examples-retrievethingdefinition.html b/1.0/protocol-examples-retrievethingdefinition.html
index 463d163..b2a1684 100644
--- a/1.0/protocol-examples-retrievethingdefinition.html
+++ b/1.0/protocol-examples-retrievethingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples-retrievethings.html

diff --git a/1.0/protocol-examples-retrievethings.html b/1.0/protocol-examples-retrievethings.html
index 68c10f1..6e5441d 100644
--- a/1.0/protocol-examples-retrievethings.html
+++ b/1.0/protocol-examples-retrievethings.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-examples.html

diff --git a/1.0/protocol-examples.html b/1.0/protocol-examples.html
index b7c9157..ac866e4 100644
--- a/1.0/protocol-examples.html
+++ b/1.0/protocol-examples.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-overview.html

diff --git a/1.0/protocol-overview.html b/1.0/protocol-overview.html
index 5128238..c829f99 100644
--- a/1.0/protocol-overview.html
+++ b/1.0/protocol-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-things-create-or-modify.html

diff --git a/1.0/protocol-specification-things-create-or-modify.html b/1.0/protocol-specification-things-create-or-modify.html
index 386f669..74bc5ea 100644
--- a/1.0/protocol-specification-things-create-or-modify.html
+++ b/1.0/protocol-specification-things-create-or-modify.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-things-delete.html

diff --git a/1.0/protocol-specification-things-delete.html b/1.0/protocol-specification-things-delete.html
index ccaaba6..a999a7d 100644
--- a/1.0/protocol-specification-things-delete.html
+++ b/1.0/protocol-specification-things-delete.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-things-messages.html

diff --git a/1.0/protocol-specification-things-messages.html b/1.0/protocol-specification-things-messages.html
index c01b136..ea15695 100644
--- a/1.0/protocol-specification-things-messages.html
+++ b/1.0/protocol-specification-things-messages.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-things-retrieve.html

diff --git a/1.0/protocol-specification-things-retrieve.html b/1.0/protocol-specification-things-retrieve.html
index 095a977..4db1475 100644
--- a/1.0/protocol-specification-things-retrieve.html
+++ b/1.0/protocol-specification-things-retrieve.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-things-search.html

diff --git a/1.0/protocol-specification-things-search.html b/1.0/protocol-specification-things-search.html
index 13538b7..6a87197 100644
--- a/1.0/protocol-specification-things-search.html
+++ b/1.0/protocol-specification-things-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-things.html

diff --git a/1.0/protocol-specification-things.html b/1.0/protocol-specification-things.html
index 3a20d1e..16955c8 100644
--- a/1.0/protocol-specification-things.html
+++ b/1.0/protocol-specification-things.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification-topic.html

diff --git a/1.0/protocol-specification-topic.html b/1.0/protocol-specification-topic.html
index 5128b6c..b6f9668 100644
--- a/1.0/protocol-specification-topic.html
+++ b/1.0/protocol-specification-topic.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-specification.html

diff --git a/1.0/protocol-specification.html b/1.0/protocol-specification.html
index 6f1bb92..472bec6 100644
--- a/1.0/protocol-specification.html
+++ b/1.0/protocol-specification.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/protocol-twinlive.html

diff --git a/1.0/protocol-twinlive.html b/1.0/protocol-twinlive.html
index 51db92a..7a354ac 100644
--- a/1.0/protocol-twinlive.html
+++ b/1.0/protocol-twinlive.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_010-M1.html

diff --git a/1.0/release_notes_010-M1.html b/1.0/release_notes_010-M1.html
index a891f2e..c01f538 100644
--- a/1.0/release_notes_010-M1.html
+++ b/1.0/release_notes_010-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_010-M3.html

diff --git a/1.0/release_notes_010-M3.html b/1.0/release_notes_010-M3.html
index c4a5fbc..0706168 100644
--- a/1.0/release_notes_010-M3.html
+++ b/1.0/release_notes_010-M3.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_020-M1.html

diff --git a/1.0/release_notes_020-M1.html b/1.0/release_notes_020-M1.html
index af7d0ff..4385ec7 100644
--- a/1.0/release_notes_020-M1.html
+++ b/1.0/release_notes_020-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_030-M1.html

diff --git a/1.0/release_notes_030-M1.html b/1.0/release_notes_030-M1.html
index 10797af..bf9b38e 100644
--- a/1.0/release_notes_030-M1.html
+++ b/1.0/release_notes_030-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_030-M2.html

diff --git a/1.0/release_notes_030-M2.html b/1.0/release_notes_030-M2.html
index 95b11bb..b025663 100644
--- a/1.0/release_notes_030-M2.html
+++ b/1.0/release_notes_030-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_080-M1.html

diff --git a/1.0/release_notes_080-M1.html b/1.0/release_notes_080-M1.html
index a2f2564..4c88300 100644
--- a/1.0/release_notes_080-M1.html
+++ b/1.0/release_notes_080-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_080-M2.html

diff --git a/1.0/release_notes_080-M2.html b/1.0/release_notes_080-M2.html
index 116dc13..ef31255 100644
--- a/1.0/release_notes_080-M2.html
+++ b/1.0/release_notes_080-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_080-M3.html

diff --git a/1.0/release_notes_080-M3.html b/1.0/release_notes_080-M3.html
index 76fb532..460bab4 100644
--- a/1.0/release_notes_080-M3.html
+++ b/1.0/release_notes_080-M3.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_080.html

diff --git a/1.0/release_notes_080.html b/1.0/release_notes_080.html
index f4ba71c..1fe4388 100644
--- a/1.0/release_notes_080.html
+++ b/1.0/release_notes_080.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_090-M1.html

diff --git a/1.0/release_notes_090-M1.html b/1.0/release_notes_090-M1.html
index cb7488d..541ccc4 100644
--- a/1.0/release_notes_090-M1.html
+++ b/1.0/release_notes_090-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_090-M2.html

diff --git a/1.0/release_notes_090-M2.html b/1.0/release_notes_090-M2.html
index 6a896fa..ec55371 100644
--- a/1.0/release_notes_090-M2.html
+++ b/1.0/release_notes_090-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_090.html

diff --git a/1.0/release_notes_090.html b/1.0/release_notes_090.html
index dc069de..b73470b 100644
--- a/1.0/release_notes_090.html
+++ b/1.0/release_notes_090.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_100-M1a.html

diff --git a/1.0/release_notes_100-M1a.html b/1.0/release_notes_100-M1a.html
index 315017d..ee6d3c7 100644
--- a/1.0/release_notes_100-M1a.html
+++ b/1.0/release_notes_100-M1a.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_100-M2.html

diff --git a/1.0/release_notes_100-M2.html b/1.0/release_notes_100-M2.html
index 454783c..9ec2ebf 100644
--- a/1.0/release_notes_100-M2.html
+++ b/1.0/release_notes_100-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/release_notes_100.html

diff --git a/1.0/release_notes_100.html b/1.0/release_notes_100.html
index d1dd0ab..52ef751 100644
--- a/1.0/release_notes_100.html
+++ b/1.0/release_notes_100.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/sandbox.html

diff --git a/1.0/sandbox.html b/1.0/sandbox.html
index b9d5bb6..7691142 100644
--- a/1.0/sandbox.html
+++ b/1.0/sandbox.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_architecture.html

diff --git a/1.0/tag_architecture.html b/1.0/tag_architecture.html
index b2d9d85..c9f10cb 100644
--- a/1.0/tag_architecture.html
+++ b/1.0/tag_architecture.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_blog.html

diff --git a/1.0/tag_blog.html b/1.0/tag_blog.html
index e7f645d..5a2e440 100644
--- a/1.0/tag_blog.html
+++ b/1.0/tag_blog.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_client_sdk.html

diff --git a/1.0/tag_client_sdk.html b/1.0/tag_client_sdk.html
index b437bcd..1fe296d 100644
--- a/1.0/tag_client_sdk.html
+++ b/1.0/tag_client_sdk.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_connectivity.html

diff --git a/1.0/tag_connectivity.html b/1.0/tag_connectivity.html
index 4eaf819..84d63ad 100644
--- a/1.0/tag_connectivity.html
+++ b/1.0/tag_connectivity.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_getting_started.html

diff --git a/1.0/tag_getting_started.html b/1.0/tag_getting_started.html
index 412a248..46a2206 100644
--- a/1.0/tag_getting_started.html
+++ b/1.0/tag_getting_started.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_http.html

diff --git a/1.0/tag_http.html b/1.0/tag_http.html
index 05b3591..38b4e54 100644
--- a/1.0/tag_http.html
+++ b/1.0/tag_http.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_installation.html

diff --git a/1.0/tag_installation.html b/1.0/tag_installation.html
index e6925c3..6a24454 100644
--- a/1.0/tag_installation.html
+++ b/1.0/tag_installation.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_model.html

diff --git a/1.0/tag_model.html b/1.0/tag_model.html
index c0fc2f0..4306707 100644
--- a/1.0/tag_model.html
+++ b/1.0/tag_model.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_news.html

diff --git a/1.0/tag_news.html b/1.0/tag_news.html
index dca4c07..fe99763 100644
--- a/1.0/tag_news.html
+++ b/1.0/tag_news.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_protocol.html

diff --git a/1.0/tag_protocol.html b/1.0/tag_protocol.html
index 86a8f4d..a3fbdbf 100644
--- a/1.0/tag_protocol.html
+++ b/1.0/tag_protocol.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_release_notes.html

diff --git a/1.0/tag_release_notes.html b/1.0/tag_release_notes.html
index 083ddd0..3e49256 100644
--- a/1.0/tag_release_notes.html
+++ b/1.0/tag_release_notes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_rql.html

diff --git a/1.0/tag_rql.html b/1.0/tag_rql.html
index 8478df4..72a704b 100644
--- a/1.0/tag_rql.html
+++ b/1.0/tag_rql.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_search.html

diff --git a/1.0/tag_search.html b/1.0/tag_search.html
index 2242b19..ba6fbed 100644
--- a/1.0/tag_search.html
+++ b/1.0/tag_search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_signal.html

diff --git a/1.0/tag_signal.html b/1.0/tag_signal.html
index 3c6ab58..240ba25 100644
--- a/1.0/tag_signal.html
+++ b/1.0/tag_signal.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

1.0/tag_troubleshooting.html

diff --git a/1.0/tag_troubleshooting.html b/1.0/tag_troubleshooting.html
index b288154..5bb27c1 100644
--- a/1.0/tag_troubleshooting.html
+++ b/1.0/tag_troubleshooting.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

404.html

diff --git a/404.html b/404.html
index 7eb52ac..f9fb5f8 100644
--- a/404.html
+++ b/404.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-overview.html

diff --git a/architecture-overview.html b/architecture-overview.html
index 1c2f65e..9d30e3f 100644
--- a/architecture-overview.html
+++ b/architecture-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-services-concierge.html

diff --git a/architecture-services-concierge.html b/architecture-services-concierge.html
index 82a60de..cbe241b 100644
--- a/architecture-services-concierge.html
+++ b/architecture-services-concierge.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-services-connectivity.html

diff --git a/architecture-services-connectivity.html b/architecture-services-connectivity.html
index 9a48167..be52a0a 100644
--- a/architecture-services-connectivity.html
+++ b/architecture-services-connectivity.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-services-gateway.html

diff --git a/architecture-services-gateway.html b/architecture-services-gateway.html
index c32702b..f0c60da 100644
--- a/architecture-services-gateway.html
+++ b/architecture-services-gateway.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-services-policies.html

diff --git a/architecture-services-policies.html b/architecture-services-policies.html
index 9834890..eda3dc3 100644
--- a/architecture-services-policies.html
+++ b/architecture-services-policies.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-services-things-search.html

diff --git a/architecture-services-things-search.html b/architecture-services-things-search.html
index 8f0101c..780cbf1 100644
--- a/architecture-services-things-search.html
+++ b/architecture-services-things-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

architecture-services-things.html

diff --git a/architecture-services-things.html b/architecture-services-things.html
index 4973233..bee6ef1 100644
--- a/architecture-services-things.html
+++ b/architecture-services-things.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-acl.html

diff --git a/basic-acl.html b/basic-acl.html
index 10cbf84..e629817 100644
--- a/basic-acl.html
+++ b/basic-acl.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-apis.html

diff --git a/basic-apis.html b/basic-apis.html
index 6a8bdde..178f3f4 100644
--- a/basic-apis.html
+++ b/basic-apis.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-auth.html

diff --git a/basic-auth.html b/basic-auth.html
index 316626c..f565377 100644
--- a/basic-auth.html
+++ b/basic-auth.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-changenotifications.html

diff --git a/basic-changenotifications.html b/basic-changenotifications.html
index 96ee5fd..ef6efb1 100644
--- a/basic-changenotifications.html
+++ b/basic-changenotifications.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-connections.html

diff --git a/basic-connections.html b/basic-connections.html
index 92395c1..69ebafb 100644
--- a/basic-connections.html
+++ b/basic-connections.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-feature.html

diff --git a/basic-feature.html b/basic-feature.html
index 613cc43..79756a9 100644
--- a/basic-feature.html
+++ b/basic-feature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-messages.html

diff --git a/basic-messages.html b/basic-messages.html
index 43fbd66..2bf9499 100644
--- a/basic-messages.html
+++ b/basic-messages.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-namespaces-and-names.html

diff --git a/basic-namespaces-and-names.html b/basic-namespaces-and-names.html
index 253b1fa..49b63b9 100644
--- a/basic-namespaces-and-names.html
+++ b/basic-namespaces-and-names.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-overview.html

diff --git a/basic-overview.html b/basic-overview.html
index b843c03..cb9f199 100644
--- a/basic-overview.html
+++ b/basic-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-placeholders.html

diff --git a/basic-placeholders.html b/basic-placeholders.html
index edb5d5d..4d7c26f 100644
--- a/basic-placeholders.html
+++ b/basic-placeholders.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-policy.html

diff --git a/basic-policy.html b/basic-policy.html
index bdb8200..201f783 100644
--- a/basic-policy.html
+++ b/basic-policy.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-rql.html

diff --git a/basic-rql.html b/basic-rql.html
index c40ae9b..a9a2206 100644
--- a/basic-rql.html
+++ b/basic-rql.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-search.html

diff --git a/basic-search.html b/basic-search.html
index 9b24799..2de52c5 100644
--- a/basic-search.html
+++ b/basic-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-signals-command.html

diff --git a/basic-signals-command.html b/basic-signals-command.html
index 8e9f02c..4147a27 100644
--- a/basic-signals-command.html
+++ b/basic-signals-command.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-signals-commandresponse.html

diff --git a/basic-signals-commandresponse.html b/basic-signals-commandresponse.html
index c15525b..b9cc0d9 100644
--- a/basic-signals-commandresponse.html
+++ b/basic-signals-commandresponse.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-signals-errorresponse.html

diff --git a/basic-signals-errorresponse.html b/basic-signals-errorresponse.html
index 6608c62..206ac9b 100644
--- a/basic-signals-errorresponse.html
+++ b/basic-signals-errorresponse.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-signals-event.html

diff --git a/basic-signals-event.html b/basic-signals-event.html
index 5d7edbf..d90ac83 100644
--- a/basic-signals-event.html
+++ b/basic-signals-event.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-signals.html

diff --git a/basic-signals.html b/basic-signals.html
index d84fb10..fbacc61 100644
--- a/basic-signals.html
+++ b/basic-signals.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

basic-thing.html

diff --git a/basic-thing.html b/basic-thing.html
index 0efbd7a..1657940 100644
--- a/basic-thing.html
+++ b/basic-thing.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

client-sdk-java.html

diff --git a/client-sdk-java.html b/client-sdk-java.html
index 478b164..bbc87fb 100644
--- a/client-sdk-java.html
+++ b/client-sdk-java.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

client-sdk-javascript.html

diff --git a/client-sdk-javascript.html b/client-sdk-javascript.html
index 76fd3a0..2dbb779 100644
--- a/client-sdk-javascript.html
+++ b/client-sdk-javascript.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

client-sdk-overview.html

diff --git a/client-sdk-overview.html b/client-sdk-overview.html
index 59e5da3..cfe6686 100644
--- a/client-sdk-overview.html
+++ b/client-sdk-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-header-mapping.html

diff --git a/connectivity-header-mapping.html b/connectivity-header-mapping.html
index ffae705..e2e419d 100644
--- a/connectivity-header-mapping.html
+++ b/connectivity-header-mapping.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-manage-connections.html

diff --git a/connectivity-manage-connections.html b/connectivity-manage-connections.html
index 56a4ecb..c38a489 100644
--- a/connectivity-manage-connections.html
+++ b/connectivity-manage-connections.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-mapping.html

diff --git a/connectivity-mapping.html b/connectivity-mapping.html
index 6d4bb43..dd02df2 100644
--- a/connectivity-mapping.html
+++ b/connectivity-mapping.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-overview.html

diff --git a/connectivity-overview.html b/connectivity-overview.html
index abaefd1..7c90870 100644
--- a/connectivity-overview.html
+++ b/connectivity-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-protocol-bindings-amqp091.html

diff --git a/connectivity-protocol-bindings-amqp091.html b/connectivity-protocol-bindings-amqp091.html
index 438985e..a24374d 100644
--- a/connectivity-protocol-bindings-amqp091.html
+++ b/connectivity-protocol-bindings-amqp091.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-protocol-bindings-amqp10.html

diff --git a/connectivity-protocol-bindings-amqp10.html b/connectivity-protocol-bindings-amqp10.html
index fd3be66..485cccb 100644
--- a/connectivity-protocol-bindings-amqp10.html
+++ b/connectivity-protocol-bindings-amqp10.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-protocol-bindings-http.html

diff --git a/connectivity-protocol-bindings-http.html b/connectivity-protocol-bindings-http.html
index c7db597..f94e4e2 100644
--- a/connectivity-protocol-bindings-http.html
+++ b/connectivity-protocol-bindings-http.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-protocol-bindings-kafka2.html

diff --git a/connectivity-protocol-bindings-kafka2.html b/connectivity-protocol-bindings-kafka2.html
index b103c74..bbc4ed6 100644
--- a/connectivity-protocol-bindings-kafka2.html
+++ b/connectivity-protocol-bindings-kafka2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-protocol-bindings-mqtt.html

diff --git a/connectivity-protocol-bindings-mqtt.html b/connectivity-protocol-bindings-mqtt.html
index 9c4310a..d812952 100644
--- a/connectivity-protocol-bindings-mqtt.html
+++ b/connectivity-protocol-bindings-mqtt.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

connectivity-tls-certificates.html

diff --git a/connectivity-tls-certificates.html b/connectivity-tls-certificates.html
index 51aceef..427f33c 100644
--- a/connectivity-tls-certificates.html
+++ b/connectivity-tls-certificates.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

feed.xml

diff --git a/feed.xml b/feed.xml
index f0e420d..0bbb26c 100644
--- a/feed.xml
+++ b/feed.xml
@@ -5,8 +5,8 @@
         <description>Announcements, tutorials and examples around Eclipse Ditto and Digital Twins</description>
         <link>https://www.eclipse.org/ditto/</link>
         <atom:link href="https://www.eclipse.org/ditto/feed.xml" rel="self" type="application/rss+xml"/>
-        <pubDate>Fri, 31 Jan 2020 13:46:28 +0000</pubDate>
-        <lastBuildDate>Fri, 31 Jan 2020 13:46:28 +0000</lastBuildDate>
+        <pubDate>Fri, 31 Jan 2020 14:40:49 +0000</pubDate>
+        <lastBuildDate>Fri, 31 Jan 2020 14:40:49 +0000</lastBuildDate>
         <generator>Jekyll v3.6.2</generator>
         
         <item>

feedback.html

diff --git a/feedback.html b/feedback.html
index 673bf48..2d7f899 100644
--- a/feedback.html
+++ b/feedback.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

glossary.html

diff --git a/glossary.html b/glossary.html
index 5a535f6..5b04161 100644
--- a/glossary.html
+++ b/glossary.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-concepts.html

diff --git a/httpapi-concepts.html b/httpapi-concepts.html
index 865c2ac..fcf3575 100644
--- a/httpapi-concepts.html
+++ b/httpapi-concepts.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-messages.html

diff --git a/httpapi-messages.html b/httpapi-messages.html
index 52e011a..3ab7df9 100644
--- a/httpapi-messages.html
+++ b/httpapi-messages.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-overview.html

diff --git a/httpapi-overview.html b/httpapi-overview.html
index 81d3121..0a15c71 100644
--- a/httpapi-overview.html
+++ b/httpapi-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-postman.html

diff --git a/httpapi-postman.html b/httpapi-postman.html
index a5c3702..0bc80f5 100644
--- a/httpapi-postman.html
+++ b/httpapi-postman.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-protocol-bindings-websocket.html

diff --git a/httpapi-protocol-bindings-websocket.html b/httpapi-protocol-bindings-websocket.html
index c7a86b9..8ee817c 100644
--- a/httpapi-protocol-bindings-websocket.html
+++ b/httpapi-protocol-bindings-websocket.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-search.html

diff --git a/httpapi-search.html b/httpapi-search.html
index cd6ec89..d122ede 100644
--- a/httpapi-search.html
+++ b/httpapi-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

httpapi-sse.html

diff --git a/httpapi-sse.html b/httpapi-sse.html
index e317099..18d09d4 100644
--- a/httpapi-sse.html
+++ b/httpapi-sse.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

installation-building.html

diff --git a/installation-building.html b/installation-building.html
index e7d362c..115b051 100644
--- a/installation-building.html
+++ b/installation-building.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

installation-operating.html

diff --git a/installation-operating.html b/installation-operating.html
index 9e1c7f7..de0fa5c 100644
--- a/installation-operating.html
+++ b/installation-operating.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

installation-running.html

diff --git a/installation-running.html b/installation-running.html
index 5995ebd..6feb15e 100644
--- a/installation-running.html
+++ b/installation-running.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

intro-digitaltwins.html

diff --git a/intro-digitaltwins.html b/intro-digitaltwins.html
index 6165766..efabc5b 100644
--- a/intro-digitaltwins.html
+++ b/intro-digitaltwins.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

intro-hello-world.html

diff --git a/intro-hello-world.html b/intro-hello-world.html
index 1ab4736..feb45d8 100644
--- a/intro-hello-world.html
+++ b/intro-hello-world.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

intro-overview.html

diff --git a/intro-overview.html b/intro-overview.html
index 4929045..a6d3e7b 100644
--- a/intro-overview.html
+++ b/intro-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

presentations.html

diff --git a/presentations.html b/presentations.html
index dbc460a..707cd09 100644
--- a/presentations.html
+++ b/presentations.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-bindings.html

diff --git a/protocol-bindings.html b/protocol-bindings.html
index 8073c73..413c626 100644
--- a/protocol-bindings.html
+++ b/protocol-bindings.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createattribute.html

diff --git a/protocol-examples-createattribute.html b/protocol-examples-createattribute.html
index 9d3c921..af8a103 100644
--- a/protocol-examples-createattribute.html
+++ b/protocol-examples-createattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createattributes.html

diff --git a/protocol-examples-createattributes.html b/protocol-examples-createattributes.html
index ec20c6e..538437d 100644
--- a/protocol-examples-createattributes.html
+++ b/protocol-examples-createattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createdefinition.html

diff --git a/protocol-examples-createdefinition.html b/protocol-examples-createdefinition.html
index 559590e..8c73923 100644
--- a/protocol-examples-createdefinition.html
+++ b/protocol-examples-createdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createfeature.html

diff --git a/protocol-examples-createfeature.html b/protocol-examples-createfeature.html
index 875ad92..9e4ef6d 100644
--- a/protocol-examples-createfeature.html
+++ b/protocol-examples-createfeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createfeatures.html

diff --git a/protocol-examples-createfeatures.html b/protocol-examples-createfeatures.html
index fb740d6..b8d48e6 100644
--- a/protocol-examples-createfeatures.html
+++ b/protocol-examples-createfeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createproperties.html

diff --git a/protocol-examples-createproperties.html b/protocol-examples-createproperties.html
index e116663..815fca4 100644
--- a/protocol-examples-createproperties.html
+++ b/protocol-examples-createproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createproperty.html

diff --git a/protocol-examples-createproperty.html b/protocol-examples-createproperty.html
index 12e0cd8..4b537d4 100644
--- a/protocol-examples-createproperty.html
+++ b/protocol-examples-createproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-creatething.html

diff --git a/protocol-examples-creatething.html b/protocol-examples-creatething.html
index 0beaeaf..0a4ffc2 100644
--- a/protocol-examples-creatething.html
+++ b/protocol-examples-creatething.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-createthingdefinition.html

diff --git a/protocol-examples-createthingdefinition.html b/protocol-examples-createthingdefinition.html
index 4ebf272..3d82164 100644
--- a/protocol-examples-createthingdefinition.html
+++ b/protocol-examples-createthingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deleteattribute.html

diff --git a/protocol-examples-deleteattribute.html b/protocol-examples-deleteattribute.html
index c87a988..90a0411 100644
--- a/protocol-examples-deleteattribute.html
+++ b/protocol-examples-deleteattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deleteattributes.html

diff --git a/protocol-examples-deleteattributes.html b/protocol-examples-deleteattributes.html
index f3e0003..338005b 100644
--- a/protocol-examples-deleteattributes.html
+++ b/protocol-examples-deleteattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deletedefinition.html

diff --git a/protocol-examples-deletedefinition.html b/protocol-examples-deletedefinition.html
index e938eb9..8c7c5fd 100644
--- a/protocol-examples-deletedefinition.html
+++ b/protocol-examples-deletedefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deletefeature.html

diff --git a/protocol-examples-deletefeature.html b/protocol-examples-deletefeature.html
index 17e3098..4327b9b 100644
--- a/protocol-examples-deletefeature.html
+++ b/protocol-examples-deletefeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deletefeatures.html

diff --git a/protocol-examples-deletefeatures.html b/protocol-examples-deletefeatures.html
index 1addf7d..5ba46f8 100644
--- a/protocol-examples-deletefeatures.html
+++ b/protocol-examples-deletefeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deleteproperties.html

diff --git a/protocol-examples-deleteproperties.html b/protocol-examples-deleteproperties.html
index bd6f829..1eb8eb1 100644
--- a/protocol-examples-deleteproperties.html
+++ b/protocol-examples-deleteproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deleteproperty.html

diff --git a/protocol-examples-deleteproperty.html b/protocol-examples-deleteproperty.html
index 14bcba7..93ebb98 100644
--- a/protocol-examples-deleteproperty.html
+++ b/protocol-examples-deleteproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deletething.html

diff --git a/protocol-examples-deletething.html b/protocol-examples-deletething.html
index 7d571c5..a29619d 100644
--- a/protocol-examples-deletething.html
+++ b/protocol-examples-deletething.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-deletethingdefinition.html

diff --git a/protocol-examples-deletethingdefinition.html b/protocol-examples-deletethingdefinition.html
index 2367bea..da889da 100644
--- a/protocol-examples-deletethingdefinition.html
+++ b/protocol-examples-deletethingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-errorresponses.html

diff --git a/protocol-examples-errorresponses.html b/protocol-examples-errorresponses.html
index 5db90a4..c874930 100644
--- a/protocol-examples-errorresponses.html
+++ b/protocol-examples-errorresponses.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifyattribute.html

diff --git a/protocol-examples-modifyattribute.html b/protocol-examples-modifyattribute.html
index 118a803..cd03aa0 100644
--- a/protocol-examples-modifyattribute.html
+++ b/protocol-examples-modifyattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifyattributes.html

diff --git a/protocol-examples-modifyattributes.html b/protocol-examples-modifyattributes.html
index 99209dc..9d429fa 100644
--- a/protocol-examples-modifyattributes.html
+++ b/protocol-examples-modifyattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifydefinition.html

diff --git a/protocol-examples-modifydefinition.html b/protocol-examples-modifydefinition.html
index dec47e4..57f5d13 100644
--- a/protocol-examples-modifydefinition.html
+++ b/protocol-examples-modifydefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifyfeature.html

diff --git a/protocol-examples-modifyfeature.html b/protocol-examples-modifyfeature.html
index 949ba31..a6a6908 100644
--- a/protocol-examples-modifyfeature.html
+++ b/protocol-examples-modifyfeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifyfeatures.html

diff --git a/protocol-examples-modifyfeatures.html b/protocol-examples-modifyfeatures.html
index ffeefa1..b714ac7 100644
--- a/protocol-examples-modifyfeatures.html
+++ b/protocol-examples-modifyfeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifyproperties.html

diff --git a/protocol-examples-modifyproperties.html b/protocol-examples-modifyproperties.html
index 71d0897..79e86a4 100644
--- a/protocol-examples-modifyproperties.html
+++ b/protocol-examples-modifyproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifyproperty.html

diff --git a/protocol-examples-modifyproperty.html b/protocol-examples-modifyproperty.html
index 37b93dd..2b07f78 100644
--- a/protocol-examples-modifyproperty.html
+++ b/protocol-examples-modifyproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifything.html

diff --git a/protocol-examples-modifything.html b/protocol-examples-modifything.html
index 6f0a7e8..10b74cf 100644
--- a/protocol-examples-modifything.html
+++ b/protocol-examples-modifything.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-modifythingdefinition.html

diff --git a/protocol-examples-modifythingdefinition.html b/protocol-examples-modifythingdefinition.html
index 92fa7e2..7da6dc9 100644
--- a/protocol-examples-modifythingdefinition.html
+++ b/protocol-examples-modifythingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrieveattribute.html

diff --git a/protocol-examples-retrieveattribute.html b/protocol-examples-retrieveattribute.html
index 36e7c81..5730e8d 100644
--- a/protocol-examples-retrieveattribute.html
+++ b/protocol-examples-retrieveattribute.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrieveattributes.html

diff --git a/protocol-examples-retrieveattributes.html b/protocol-examples-retrieveattributes.html
index afeaa00..eff001b 100644
--- a/protocol-examples-retrieveattributes.html
+++ b/protocol-examples-retrieveattributes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrievedefinition.html

diff --git a/protocol-examples-retrievedefinition.html b/protocol-examples-retrievedefinition.html
index e3e10e7..72d22d5 100644
--- a/protocol-examples-retrievedefinition.html
+++ b/protocol-examples-retrievedefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrievefeature.html

diff --git a/protocol-examples-retrievefeature.html b/protocol-examples-retrievefeature.html
index 3714fa8..63ca888 100644
--- a/protocol-examples-retrievefeature.html
+++ b/protocol-examples-retrievefeature.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrievefeatures.html

diff --git a/protocol-examples-retrievefeatures.html b/protocol-examples-retrievefeatures.html
index 13ebd05..2a7fdff 100644
--- a/protocol-examples-retrievefeatures.html
+++ b/protocol-examples-retrievefeatures.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrieveproperties.html

diff --git a/protocol-examples-retrieveproperties.html b/protocol-examples-retrieveproperties.html
index b433bfe..ad32015 100644
--- a/protocol-examples-retrieveproperties.html
+++ b/protocol-examples-retrieveproperties.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrieveproperty.html

diff --git a/protocol-examples-retrieveproperty.html b/protocol-examples-retrieveproperty.html
index 361585f..60de151 100644
--- a/protocol-examples-retrieveproperty.html
+++ b/protocol-examples-retrieveproperty.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrievething.html

diff --git a/protocol-examples-retrievething.html b/protocol-examples-retrievething.html
index a1da209..353b0f3 100644
--- a/protocol-examples-retrievething.html
+++ b/protocol-examples-retrievething.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrievethingdefinition.html

diff --git a/protocol-examples-retrievethingdefinition.html b/protocol-examples-retrievethingdefinition.html
index 463d163..b2a1684 100644
--- a/protocol-examples-retrievethingdefinition.html
+++ b/protocol-examples-retrievethingdefinition.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples-retrievethings.html

diff --git a/protocol-examples-retrievethings.html b/protocol-examples-retrievethings.html
index 68c10f1..6e5441d 100644
--- a/protocol-examples-retrievethings.html
+++ b/protocol-examples-retrievethings.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-examples.html

diff --git a/protocol-examples.html b/protocol-examples.html
index b7c9157..ac866e4 100644
--- a/protocol-examples.html
+++ b/protocol-examples.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-overview.html

diff --git a/protocol-overview.html b/protocol-overview.html
index 5128238..c829f99 100644
--- a/protocol-overview.html
+++ b/protocol-overview.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-things-create-or-modify.html

diff --git a/protocol-specification-things-create-or-modify.html b/protocol-specification-things-create-or-modify.html
index 386f669..74bc5ea 100644
--- a/protocol-specification-things-create-or-modify.html
+++ b/protocol-specification-things-create-or-modify.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-things-delete.html

diff --git a/protocol-specification-things-delete.html b/protocol-specification-things-delete.html
index ccaaba6..a999a7d 100644
--- a/protocol-specification-things-delete.html
+++ b/protocol-specification-things-delete.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-things-messages.html

diff --git a/protocol-specification-things-messages.html b/protocol-specification-things-messages.html
index c01b136..ea15695 100644
--- a/protocol-specification-things-messages.html
+++ b/protocol-specification-things-messages.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-things-retrieve.html

diff --git a/protocol-specification-things-retrieve.html b/protocol-specification-things-retrieve.html
index 095a977..4db1475 100644
--- a/protocol-specification-things-retrieve.html
+++ b/protocol-specification-things-retrieve.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-things-search.html

diff --git a/protocol-specification-things-search.html b/protocol-specification-things-search.html
index 13538b7..6a87197 100644
--- a/protocol-specification-things-search.html
+++ b/protocol-specification-things-search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-things.html

diff --git a/protocol-specification-things.html b/protocol-specification-things.html
index 3a20d1e..16955c8 100644
--- a/protocol-specification-things.html
+++ b/protocol-specification-things.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification-topic.html

diff --git a/protocol-specification-topic.html b/protocol-specification-topic.html
index 5128b6c..b6f9668 100644
--- a/protocol-specification-topic.html
+++ b/protocol-specification-topic.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-specification.html

diff --git a/protocol-specification.html b/protocol-specification.html
index d9ec74b..3cae220 100644
--- a/protocol-specification.html
+++ b/protocol-specification.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

protocol-twinlive.html

diff --git a/protocol-twinlive.html b/protocol-twinlive.html
index 51db92a..7a354ac 100644
--- a/protocol-twinlive.html
+++ b/protocol-twinlive.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_010-M1.html

diff --git a/release_notes_010-M1.html b/release_notes_010-M1.html
index a891f2e..c01f538 100644
--- a/release_notes_010-M1.html
+++ b/release_notes_010-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_010-M3.html

diff --git a/release_notes_010-M3.html b/release_notes_010-M3.html
index c4a5fbc..0706168 100644
--- a/release_notes_010-M3.html
+++ b/release_notes_010-M3.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_020-M1.html

diff --git a/release_notes_020-M1.html b/release_notes_020-M1.html
index af7d0ff..4385ec7 100644
--- a/release_notes_020-M1.html
+++ b/release_notes_020-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_030-M1.html

diff --git a/release_notes_030-M1.html b/release_notes_030-M1.html
index 10797af..bf9b38e 100644
--- a/release_notes_030-M1.html
+++ b/release_notes_030-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_030-M2.html

diff --git a/release_notes_030-M2.html b/release_notes_030-M2.html
index 95b11bb..b025663 100644
--- a/release_notes_030-M2.html
+++ b/release_notes_030-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_080-M1.html

diff --git a/release_notes_080-M1.html b/release_notes_080-M1.html
index a2f2564..4c88300 100644
--- a/release_notes_080-M1.html
+++ b/release_notes_080-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_080-M2.html

diff --git a/release_notes_080-M2.html b/release_notes_080-M2.html
index 116dc13..ef31255 100644
--- a/release_notes_080-M2.html
+++ b/release_notes_080-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_080-M3.html

diff --git a/release_notes_080-M3.html b/release_notes_080-M3.html
index 76fb532..460bab4 100644
--- a/release_notes_080-M3.html
+++ b/release_notes_080-M3.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_080.html

diff --git a/release_notes_080.html b/release_notes_080.html
index f4ba71c..1fe4388 100644
--- a/release_notes_080.html
+++ b/release_notes_080.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_090-M1.html

diff --git a/release_notes_090-M1.html b/release_notes_090-M1.html
index cb7488d..541ccc4 100644
--- a/release_notes_090-M1.html
+++ b/release_notes_090-M1.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_090-M2.html

diff --git a/release_notes_090-M2.html b/release_notes_090-M2.html
index 6a896fa..ec55371 100644
--- a/release_notes_090-M2.html
+++ b/release_notes_090-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_090.html

diff --git a/release_notes_090.html b/release_notes_090.html
index dc069de..b73470b 100644
--- a/release_notes_090.html
+++ b/release_notes_090.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_100-M1a.html

diff --git a/release_notes_100-M1a.html b/release_notes_100-M1a.html
index 315017d..ee6d3c7 100644
--- a/release_notes_100-M1a.html
+++ b/release_notes_100-M1a.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_100-M2.html

diff --git a/release_notes_100-M2.html b/release_notes_100-M2.html
index 454783c..9ec2ebf 100644
--- a/release_notes_100-M2.html
+++ b/release_notes_100-M2.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

release_notes_100.html

diff --git a/release_notes_100.html b/release_notes_100.html
index ca53e84..82fd288 100644
--- a/release_notes_100.html
+++ b/release_notes_100.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

sandbox.html

diff --git a/sandbox.html b/sandbox.html
index b9d5bb6..7691142 100644
--- a/sandbox.html
+++ b/sandbox.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_architecture.html

diff --git a/tag_architecture.html b/tag_architecture.html
index b2d9d85..c9f10cb 100644
--- a/tag_architecture.html
+++ b/tag_architecture.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_blog.html

diff --git a/tag_blog.html b/tag_blog.html
index e7f645d..5a2e440 100644
--- a/tag_blog.html
+++ b/tag_blog.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_client_sdk.html

diff --git a/tag_client_sdk.html b/tag_client_sdk.html
index b437bcd..1fe296d 100644
--- a/tag_client_sdk.html
+++ b/tag_client_sdk.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_connectivity.html

diff --git a/tag_connectivity.html b/tag_connectivity.html
index 4eaf819..84d63ad 100644
--- a/tag_connectivity.html
+++ b/tag_connectivity.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_getting_started.html

diff --git a/tag_getting_started.html b/tag_getting_started.html
index 0eb0b7c..c02075a 100644
--- a/tag_getting_started.html
+++ b/tag_getting_started.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_http.html

diff --git a/tag_http.html b/tag_http.html
index 05b3591..38b4e54 100644
--- a/tag_http.html
+++ b/tag_http.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_installation.html

diff --git a/tag_installation.html b/tag_installation.html
index f658e22..2794ada 100644
--- a/tag_installation.html
+++ b/tag_installation.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_model.html

diff --git a/tag_model.html b/tag_model.html
index c0fc2f0..4306707 100644
--- a/tag_model.html
+++ b/tag_model.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_news.html

diff --git a/tag_news.html b/tag_news.html
index dca4c07..fe99763 100644
--- a/tag_news.html
+++ b/tag_news.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_protocol.html

diff --git a/tag_protocol.html b/tag_protocol.html
index 86a8f4d..a3fbdbf 100644
--- a/tag_protocol.html
+++ b/tag_protocol.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_release_notes.html

diff --git a/tag_release_notes.html b/tag_release_notes.html
index 083ddd0..3e49256 100644
--- a/tag_release_notes.html
+++ b/tag_release_notes.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_rql.html

diff --git a/tag_rql.html b/tag_rql.html
index 8478df4..72a704b 100644
--- a/tag_rql.html
+++ b/tag_rql.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_search.html

diff --git a/tag_search.html b/tag_search.html
index 2242b19..ba6fbed 100644
--- a/tag_search.html
+++ b/tag_search.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_signal.html

diff --git a/tag_signal.html b/tag_signal.html
index 3c6ab58..240ba25 100644
--- a/tag_signal.html
+++ b/tag_signal.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }

tag_troubleshooting.html

diff --git a/tag_troubleshooting.html b/tag_troubleshooting.html
index b288154..5bb27c1 100644
--- a/tag_troubleshooting.html
+++ b/tag_troubleshooting.html
@@ -1178,14 +1178,20 @@
 function changeSelectedDocVersion() {
   var versionValue = $('#docVersion').val();
   var remainingPath = window.location.pathname.replace("/ditto/", "");
-  var splittedVersionAndRemaining = remainingPath.split("/", 2);
-  if (splittedVersionAndRemaining[0] === versionValue) {
+  var versionMatch = remainingPath.match("([0-9].[0.9])/(.*)");
+  if (versionValue === "" && !versionMatch) {
+    // do nothing, we're already on the correct "dev" version
+  } else if (versionMatch && (versionValue === versionMatch[1])) {
     // do nothing, we're already on the correct version
   } else {
-    if (versionValue === "") {
-      window.location.pathname = "ditto/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+    if (versionValue === "" && versionMatch) {
+      window.location.pathname = "ditto/" + versionMatch[2];
+    } else if (versionValue === "") {
+      window.location.pathname = "ditto/" + remainingPath;
+    } else if (versionMatch) {
+      window.location.pathname = "ditto/" + versionValue + "/" + versionMatch[2];
     } else {
-      window.location.pathname = "ditto/" + versionValue + "/" + splittedVersionAndRemaining[1] ? splittedVersionAndRemaining[1] : splittedVersionAndRemaining[0];
+      window.location.pathname = "ditto/" + versionValue + "/" + remainingPath;
     }
   }
 }