[support] Best way to handle multi-valued fields