Code changes for boolean field. Used single variable in template.