JBIDE-13499 proper navigation links