Updated search button and next button selection