Add support for External Selection
Fixes for improving selection