Fixes Bugs in Upcoming Events