Item selectors now use single generic component.