[FIX] XML Parsing: use default XML parsing in more cases