remove bugs in email and listing