fix date value handling on retrieval