Reworking location-matching logic