escaped attributes and removed comment
Escaped a couple of missed attributes and check existence of field values.