ECLIPSE-930 - Modified navigator to always pick up root nodes