Tweak to Tag Addition Code
Merge branch 'fix_tag_error'