improved navigation with search