Improvement building XPATH from XML file