ensure we do proper matching fields with address fields.