diff --git a/assets/js/package_search.js b/assets/js/package_search.js
index 686bfa29a..d463ee2ee 100644
--- a/assets/js/package_search.js
+++ b/assets/js/package_search.js
@@ -6,16 +6,30 @@
         fortranLang.loadJSON(fortranLang.baseurl+'/packages/package_index.json', search);
 
     }
+    
+function query_params(query) {
+    query = query.split('+').join(' ');
+
+    var params = {},
+        tokens,
+        re = /[?&]?([^=]+)=([^&]*)/g;
 
+    while (tokens = re.exec(query)) {
+        params['1'] = decodeURIComponent(tokens[2]);
+    }
+    
+
+    return params['1'];
+}
     
     function search(data){
         // Called after json data is loaded
         //
         
         projects = data.projects;
-
+        
         // Get search string
-        var queryString = fortranLang.findGetParameter('query').replace(/\+/g," ").replace(/"/g,'');
+        var queryString = query_params(fortranLang.findGetParameter('query'));
         document.getElementById('search-query').value = queryString;
 
         results = searchProjects(queryString,projects);