Adding more sane behavior for default stream selection