improved navigation, better tag handling