Changed "or" to "||" for if, and ensured data in CDATA sections is XML escaped now