Issue #2170177 by bpiwowar: Properly handle multi-value fields when a subfield is mapped first