Issue #1: fix error with non-required dates causing validation error when not supplied