Improve handling of search for existing locations when saving partner records