fix and refactoring

fixed bug in XPathNavigator