Use date range instead of number of days #6102