Modify xml parser for a better management when comments are found