fixing issues with tagging support in scripts