Refactor user tags