Ajay/Melanie |#3936| Replacing NaN to empty string for calculate