Correctly update selected item after delete
Fix problem restarting after hitting eof