Yahoo endpoint is a little bit crap
Fix yahoo weirdness