Updated filtering annotation. Added new annotation for grouping.