some more changes for the email / name search