Support navs whose children aren't immediate siblings Performance update. v1.7