make instruction tags html_safe and remove typo from shipped_email.