Make date fields optional