Tag based count and smaller changes