Improving selection
Fixing the right order in setSelection