fixing duplicate events been stored in db bug and removing dependency of collector knowing about roll up types