Fix for multi-params template

Allow comma to be used in macro for multi-params template