Fix email and Yahoo team parser