[OnDemand] Fix some data parsing Issues

Issues with dates and also data not being a string.