Improve INavigationRoot awareness handling.

If original query is None or [] then it should not be touched.