Fix for date key when does not exist in db
v1.6.0_pre3