MLDS-312 Support country and email in search