Fix #9480: correct various selection issues with data browser.

rebases #526