adjustments to address & contact fields, add crm-edit for select custom
fields