Change service templating method
Removed special character from service macros