Refactored so a Grouped and a Faceted result is wrapped in the same class, enabling a query that return both. (EA-206)