retain subLocality and locality for geolocations

sometimes a shorter name might be necessary (i.e. without both subLocality AND locality concatenated)