Fix issues related to Challenge Terms.

https://appirio.my.salesforce.com/a3v50000000IAGy
https://appirio.my.salesforce.com/a3v50000000I9uAAAS