Adds email searching as well