core-4858 fix single select and drag-n-drop issues.