Reworked to use new hosts/by_location service