Added return to picker for multiple choice