capitalize references to Id and Email
no more dist
generate_from_lead order prefers email