Better (read: extant) handling of non-UK locations,