Improve search facets