Adding better range detection for future dates