Patch nearest_coord_match for multiple return
Minor edits