Got rid of coordinate/city mode and instead using blocks to complete city query