Fix issue with JSON null in date fields