Fix persisting selections