Refactoring, renaming, fixing single-select with existing selection.