Merge pull request #358 from lukedirtwalker/issue273
Display all fields when using template setting, fixes #273