This should fix the upcoming events page