Minor bug fix and futher improved selection actions.