improved speed of item selection handling