Updates to tagging scripts