CAL-684 include until date in occurrences list