Conserve sort on navigation. Fix #3