SelectedItems conversion fixed in several places