Refactoring item selection