Minor bug fix and template helper change.

Fixed bug in conditional display;
Added '' to field names;