grouping and filter added