Improve yahoo parsing