New nav_is function, hierarchical terms creation
Fix conflicts