Added more search options