Added filter when email is None