fixed selection screen cleanup
Merge branch 'master' into selection-fixes