fixes to tagging system