Removing hard-coded $ symbols from the template, addressing Bug 2547