Multiple search fields/values

Improving the functionality of search and adding multiple fields for
search.