diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js
index 1ac8d23e1a6dd99efcca022de694952bdd26a77e..e7aa903a6329e9ae1d87b8eed99369d192711bf1 100644
--- a/core/modules/views/js/base.js
+++ b/core/modules/views/js/base.js
@@ -17,14 +17,13 @@
     if (pos !== -1) {
       query = query.substring(pos + 1);
     }
+    var pair;
     var pairs = query.split('&');
-    for(var i in pairs) {
-      if (typeof(pairs[i]) === 'string') {
-        var pair = pairs[i].split('=');
-        // Ignore the 'q' path argument, if present.
-        if (pair[0] !== 'q' && pair[1]) {
-          args[decodeURIComponent(pair[0].replace(/\+/g, ' '))] = decodeURIComponent(pair[1].replace(/\+/g, ' '));
-        }
+    for (var i = 0; i < pairs.length; i++) {
+      pair = pairs[i].split('=');
+      // Ignore the 'q' path argument, if present.
+      if (pair[0] !== 'q' && pair[1]) {
+        args[decodeURIComponent(pair[0].replace(/\+/g, ' '))] = decodeURIComponent(pair[1].replace(/\+/g, ' '));
       }
     }
     return args;
@@ -69,7 +68,7 @@
       href = href.substring(3, href.length);
     }
     var chars = ['#', '?', '&'];
-    for (var i in chars) {
+    for (var i = 0; i < chars.length; i++) {
       if (href.indexOf(chars[i]) > -1) {
         href = href.substr(0, href.indexOf(chars[i]));
       }