Fix group selection