Major tags overhaul combining user and team tags