Improve Facets functions. (not supported in preprocessFilter)

@LGalatin - how do we prioritize this