Added filtering for companies
fixing mailer for production