Improve selection, dragging selection, support for Safe mode