Updated contact template to allow inclusion of map and address from custom fields