Andy: Fix the issue of loop within one city.