Added xml escaping on more element