tagging improvements