rework selector grouping