Add filter by email and fix text2html