fix bug
support tagging