Added more options to search