Fix bugs after add the feagure of tag.