More improvements to contacts chooser and adapter...