Changed calendar logic to request only the date range specified on the current calendar