Added feature to only show upcoming events