fix overlapping selections issue