Update for new cursor and fix user-select issue