More tweaks to tag performance