fix date fields to allow removal of dates and add defer and completed dates