Implemeneted some more fields and added HTML escaping