Add support for search criteria
commit push test