More perf improvements to tags