improve support for multi-value fields