Fixed bug with events showing up in both current and past events