Fixed tag count support. Still not added to events