XML extractor improvements

This PR addresses issue #102