Added minor tagging improvements.