diff --git a/web/public/javascripts/routers/advancedSearch.js b/web/public/javascripts/routers/advancedSearch.js
index dbc7adb52a..cc413e84e7 100644
--- a/web/public/javascripts/routers/advancedSearch.js
+++ b/web/public/javascripts/routers/advancedSearch.js
@@ -23,7 +23,7 @@ App.AdvsearchRoute = Ember.Route.extend({
     var q = convertQueryStringToObject()
     currentTab = 'Datasets';
     updateActiveTab();
-    query = encodeURIComponent(atob(q.query));
+    query = q.query;
     var url = 'api/v1/advsearch/search?searchOpts=' + query + '&page=' + params.page;
     $.get(url, function(data) {
       if (data && data.status == "ok") {
diff --git a/web/public/javascripts/routers/search.js b/web/public/javascripts/routers/search.js
index 6673760396..5a1eb1f222 100644
--- a/web/public/javascripts/routers/search.js
+++ b/web/public/javascripts/routers/search.js
@@ -55,7 +55,7 @@ App.SearchRoute = Ember.Route.extend({
             q = convertQueryStringToObject();
         }
 
-        var keyword = atob(q.keywords);
+        var keyword = encodeURIComponent(q.keywords);
         var url = 'api/v1/search' + '?page=' + params.page + "&keyword=" + keyword;
         if(q.category) {
             url += ("&category=" + q.category.toLowerCase());
diff --git a/web/public/javascripts/search.js b/web/public/javascripts/search.js
index 7f51b04b64..1adc7a7d32 100644
--- a/web/public/javascripts/search.js
+++ b/web/public/javascripts/search.js
@@ -14,7 +14,7 @@
   const handleSearchInput = function () {
     if (searchInput) {
       const {value: keyword} = searchInput;
-      const searchRouteHash = `#/search?keywords=${btoa(keyword)}&category=${global.g_currentCategory}&source=default&page=1`;
+      const searchRouteHash = `#/search?keywords=${encodeURIComponent(keyword)}&category=${global.g_currentCategory}&source=default&page=1`;
       keyword && (document.location.hash = searchRouteHash);
     }
   };
@@ -432,7 +432,7 @@
     advSearchOpts.fields = {'any': fieldAny, 'all': fieldAll, 'not': fieldNotIn};
     advSearchOpts.comments = comments;
     advSearchOpts.sources = sources;
-    global.location = '/#/advsearch/?query=' + btoa(JSON.stringify(advSearchOpts)) + '&page=1';
+    global.location = '/#/advsearch/?query=' + encodeURIComponent(JSON.stringify(advSearchOpts)) + '&page=1';
   }
 
   function advSearchForFlow() {
@@ -495,7 +495,7 @@
     advSearchOpts.appcode = {'in': appcodeIn, 'not': appcodeNotIn};
     advSearchOpts.flow = {'in': flowIn, 'not': flowNotIn};
     advSearchOpts.job = {'in': jobIn, 'not': jobNotIn};
-    global.location = '/#/advsearch/?query=' + btoa(JSON.stringify(advSearchOpts)) + '&page=1';
+    global.location = '/#/advsearch/?query=' + encodeURIComponent(JSON.stringify(advSearchOpts)) + '&page=1';
   }
 
   $('#advSearchBtn').click(function () {