Restore selection intelligently upon refresh