[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)