Selection order after refresh fixed. Closes #2079