got rid of district/subdistrict extId collisions