MANTA-20 fix new dataSet feature