Mass selection fix. Single selection fix.

Framework fixes for selection mechanism.