Added the search option