tweaks to tagging