Fix navigation sorting