Make validity period calendar components less error prone