Improved multi selection