[neil, kelvin] X fix date formatting issues and default date to blank