Improved stream select and group select after code review.