SP-366 - Enforce correct date ranges