Got all of the search options working