fixed addresses_fields helper