Refactor Survey Group Selection, Survey Selection