diff --git a/index.html b/index.html
index 7e4638d..a00fd94 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,6 @@ <h2>Gist HTML Preview</h2>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
-  <script src="https://cdn.rawgit.com/github/fetch/master/fetch.js"></script>
   <script src="./main.js"></script>
 </body>
 </html>
diff --git a/main.js b/main.js
index 13e9a1b..0b0600a 100644
--- a/main.js
+++ b/main.js
@@ -13,10 +13,10 @@
   }
 
   function submit () {
-    var query = document.getElementById('gist_id').value;
+    var query = "q=" + document.getElementById('gist_id').value;
     var fileName = document.getElementById('file_name').value;
     if (fileName) {
-      query += '/' + fileName;
+      query += '&f=' + fileName;
     }
     location.search = query;  // page will be refreshed
   }
@@ -27,16 +27,16 @@
   }
 
   // 1. check query string
-  var query = location.search.substring(1);
-  if (query.length === 0) {
+  const urlParams = new URLSearchParams(window.location.search);
+  const query = urlParams.get('q');
+  if (!query) {
     showMainPage();
     return;
   }
 
   // 2. get gist id and file name
-  query = query.split('/');
-  var gistId = query[0];
-  var fileName = decodeURIComponent(query[1] || '');
+  const gistId = query;
+  var fileName = decodeURIComponent(urlParams.get('f') || '');
 
   // 3. write data to blank
   document.getElementById('gist_id').value = gistId;