Additional changes to navigation sorting