fixed parsing datetime and replaced today string with an actual date