Add escaping facet value
Merge branch 'f/fix-search-facets'