CalendarEntry: Changed a control to a loop
SS3.1 Fixes