Bug fix on events listing