Fix upcomming events order