fix #1495 click on selected row
#1493 fix selection