Simplify group selection logic