fix bugs for nav counts
merge from master