fixed terams of service bug of validation and added optional fields to custom fields