Fix casting error after merge
Fix also select current cell when selecting whole row/column