CAL-624 update end time suggestion, fix bug