diff --git a/dist/index.html b/dist/index.html
index 4b2642cf..b35d28ae 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -24,9 +24,9 @@
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
   <script type="text/javascript">
     $(function () {
-      var url = decodeURIComponent(window.location.search.match(/url=([^&]+)/));
+      var url = window.location.search.match(/url=([^&]+)/);
       if (url && url.length > 1) {
-        url = url[1];
+        url = decodeURIComponent(url[1]);
       } else {
         url = "http://petstore.swagger.wordnik.com/v2/swagger.json";
       }
diff --git a/src/main/html/index.html b/src/main/html/index.html
index 4b2642cf..b35d28ae 100644
--- a/src/main/html/index.html
+++ b/src/main/html/index.html
@@ -24,9 +24,9 @@
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
   <script type="text/javascript">
     $(function () {
-      var url = decodeURIComponent(window.location.search.match(/url=([^&]+)/));
+      var url = window.location.search.match(/url=([^&]+)/);
       if (url && url.length > 1) {
-        url = url[1];
+        url = decodeURIComponent(url[1]);
       } else {
         url = "http://petstore.swagger.wordnik.com/v2/swagger.json";
       }
diff --git a/src/test/e2e/index.js b/src/test/e2e/index.js
index 68eb7845..c126fa0d 100644
--- a/src/test/e2e/index.js
+++ b/src/test/e2e/index.js
@@ -66,6 +66,33 @@ describe('basics', function (done) {
   checkConsoleErrors();
 });
 
+
+describe('should render key elements in document', function () {
+  var elementQueries = [
+    'swagger-ui-container',
+    'resources_container',
+    'api_info',
+    'resource_pet',
+    'resource_store',
+    'resource_user',
+    'header'
+  ];
+
+  this.timeout(10000);
+
+  elementQueries.forEach(function (id) {
+
+    it('should render element: ' + id, function (done) {
+
+      var locator = webdriver.By.id(id)
+      driver.isElementPresent(locator).then(function (isPresent) {
+        expect(isPresent).to.be.true;
+        done();
+      });
+    });
+  })
+});
+
 describe('cleanup', function  () {
   it('kills the static server', function () {
     server.close();