[IMP] Improved some changes for website_event and website_mail.