Adding 'Auto' stream selection