Improved dialog selection.