Updated the tag selection issue