Added support for preserving selections after updates