Fixes for SelectedItem