field names fix for addresses