Base: Ensure correct escaping.

Corrects issue noted with email not being escaped in review.

In addition uses fieldValue everywhere instead of a mixture.