Refactored the search command

... uses an array of search parameters now.