filter groups at the render level, rather than the data fetching level

filter groups at the render level, rather than the data fetching level #6392