Merge "Use findSelectedItem instead of getSelectedItem"