More tweaks to tags