Fix mappings for repeatable fields