Do not let invalid dates be populated
Merge