modify cursors and fix the single selection