Avoid using language macro

Hi Nate,

I made some changes about velocity template files, please see my email for details about the changes.


Thanks.
Tina.