minor query improvement on navigation generation
improved navigation menu generation