NH-3049 - Fix mapping to fields