refactored container item selection