diff --git a/src/api/search/search.routes.js b/src/api/search/search.routes.js
index 48f23287..50b52f56 100644
--- a/src/api/search/search.routes.js
+++ b/src/api/search/search.routes.js
@@ -129,13 +129,13 @@ router.route('/autocomplete')
         bool: {
           should: [{
             query_string: {
-              query: `*"${query.replace(/-/g, ' ')}"*`,
+              query: `*"${query.replace(/[-_]/g, ' ')}"*`,
               default_operator: 'AND',
               fields: searchedFields,
             },
           }, {
             query_string: {
-              query: `*${query.replace(/-/g, ' ')}*`,
+              query: `*${query.replace(/[-_]/g, ' ')}*`,
               default_operator: 'AND',
               fields: searchedFields,
             },