added search criteria
added mapping