refactor tagging usage