Navlist tags refactor