CRF 45773

fix: include navpointId in mainMenu search links to retrieve navpoint data.
CRF 45773

changes based on code review.
Merge branch 'refs/heads/production' into ej-crf45773
merged from origin/production