Made list item selection more reliable