[IMP][website_mail] Improved data selectors and minor changes