Selection: revise deselection guard to be more strict; add comment