Fix datepicker/event ordering