Updated way fields with multiple values are handled