issue #20734: Work on selection logic for better UI experience.