Merge "Add second filter step after grouping and sorting"