Restore user tags from PR #69