@Ferdi isn't an event that has already started no longer "Upcoming"?  I am worried that this may cause additional bugs when the end time is not populated or when an event is set to last a very long time...