Better tracking of events per topic