emailID and companyID now accept name or id