Fixed ampresand escape and missing code close tag