Improved handling of stored selection