Minor refactoring
Implement faster and more robust tag jumping