fix substituting xml type
adjust examples