Adjusted code related to tag
Merge pull request #907 from linzongshu/develop

Adjusted code related to tag