"Upcoming" events must include those in progress, otherwise you don't see a 3-day festival that just started, which is too harsh a limitation. This does give excessive prominence to month-long events and we'll be looking at alternate solutions for that