handle census tract properly in location upgrade, #23422