Re-implemented the infobox query for better performance & scalability.