Improve selection behavior
Support restoration