improve handling of sublocations in TomTom geocoding, #25658, #13763