diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
index 9e730b030..bfcdd0055 100644
--- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
@@ -141,7 +141,7 @@
         if ('operator' in json_query && json_query.operator.startsWith("not_")){
           string_query +=  "NOT ";
         }
-        string_query += json_query.field + ":\"" + json_query.value.toString().replace(/['"]+/g,'').replace(/#/g,'%23') + "\"";
+        string_query += json_query.field + ":" + json_query.value.toString().replace(/[']+/g,'').replace(/#/g,'%23') ;
       }
 	  return string_query;
 	}
@@ -164,7 +164,7 @@
 	values: {
       <#list searchFilters as filter>
         <#if filter.field == field.field>
-          '${filter.id}':'${filter.name}',
+          '&quot;${filter.id}&quot;':'${filter.name}',
         </#if>
       </#list>