diff --git a/content/pages/dataview.html b/content/pages/dataview.html
index 3affc668..5910cbf7 100644
--- a/content/pages/dataview.html
+++ b/content/pages/dataview.html
@@ -8,6 +8,7 @@
   <body>
       <script src="{static}/scripts/getFullDataPath.js" type="text/javascript"></script>
       <script src="{static}/scripts/getTextFromFile.js" type="text/javascript"></script>
+      <script src="{static}/scripts/parseQueryStringToDictionary.js" type="text/javascript"></script>
     <script>
 
       window.onload=async function(){
@@ -25,8 +26,10 @@
         }
         console.warn(mystr);
       }
-      if(location.hash.length>1){       
-        var filename=location.hash.substr(1);
+      queryDic=parseQueryStringToDictionary()
+      key="dataFile"
+      if(queryDic[key]!=undefined){       
+        var filename=queryDic[key];
         var path=getFullDataPath(filename);
         var textPromise=getTextFromFileAsync(path) 
         btn_download=document.getElementById("btn_download");
diff --git a/content/pages/index.html b/content/pages/index.html
index f06f6bb5..4bcdbf7e 100644
--- a/content/pages/index.html
+++ b/content/pages/index.html
@@ -18,7 +18,7 @@
      async function update_file(filename) {
         var file=filename+'.dat';
         var lnk_file=document.getElementById('lnk_file');
-        lnk_file.setAttribute('href',String.raw`view#${file}`);
+        lnk_file.setAttribute('href',String.raw`view?dataFile=${file}`);
         dat= await data.loadAsync(file);
         await applyData(dat);
       }
diff --git a/content/scripts/parseQueryStringToDictionary.js b/content/scripts/parseQueryStringToDictionary.js
new file mode 100644
index 00000000..8fcce9b6
--- /dev/null
+++ b/content/scripts/parseQueryStringToDictionary.js
@@ -0,0 +1,31 @@
+function parseQueryStringToDictionary(queryString=window.location.search) {
+  var dictionary = {};
+
+  // remove the '?' from the beginning of the
+  // if it exists
+  if (queryString.indexOf('?') === 0) {
+    queryString = queryString.substr(1);
+  }
+
+  // Step 1: separate out each key/value pair
+  var parts = queryString.split('&amp;');
+
+  for (var i = 0; i < parts.length; i++) {
+    var p = parts[i];
+    // Step 2: Split Key/Value pair
+    var keyValuePair = p.split('=');
+
+    // Step 3: Add Key/Value pair to Dictionary object
+    var key = keyValuePair[0];
+    var value = keyValuePair[1];
+
+    // decode URI encoded string
+    value = decodeURIComponent(value);
+    value = value.replace(/\+/g, ' ');
+
+    dictionary[key] = value;
+  }
+
+  // Step 4: Return Dictionary Object
+  return dictionary;
+}
