Templating works better if it has the right placeholder (bug 1083606)
Merge pull request #561 from muffinresearch/fix-template-for-terms

Templating works better if it has the right placeholder (bug 1083606)