double sort bug fix (nav module)
refactoring