CMS-1263 Fix the content facet browsing

Moved filter to query to also apply to facets. Stupid.