Selection: revise deselection guard to be more strict; add comment
Fix incorrect file name in doh test