remove lat/lng, add other location columns