visitor navigation, small perf opt, clustering bug it1