Adjustments to use email_template and tags