TagNavigator refactoring