fix and test two long outstanding bugs

1) near duplicates that fall into slightly different geo buckets
2) wasn't filling in ambiguous name parts for highlightedname