template changes, fix for email subjects