Updated group filter

Updated group filter