Fix some issues related to map fields and rule with quantity fields and how they are being cloned (especially during an add)