Various selection fixes

Some minor refactors, and some fixes on top for reported regressions in 3.34.

Closes: #845 (closed) #793 (closed) #842 (closed) #789 (closed)