fixed city and country isp list calculations, Closes #9