improve tagging
improve tagging more