I'm with @jayofdoom on this one. I don't actually like the other fix (for the same reasons, speed and API Costs) but it's definitely more comprehensive.