PRESALES-291 : Improve the search service to be compliant with search facets