Fix item selection on refresh