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

All tests pass.
Where is the "show_production" bit of this short-circuit behavior at?