Some fixes for the new close-as-dupe selection