fixed upcoming event date handling