Fixed duplication of past and current events