Improved selection modify performance