fixes #7949 improve dedupe matching on city field