Replace hr in favour of new line in comment append
Add db-side support for template variables