Rework current filters block to use groupings