Minor modifications to search flow.