Added support for user select at caret