Add contact fields search criteria implementation & unit tests