Fixed issues related to the tag changes.