Fix for converting date values into front-end format

Post commit code review : Daniel Jao