Moved facets from group search to facet query [PD-722]

All tests pass.