Improved item selection