Fix email template
Fix labeling code