add searching
Merge branch 'sendgrid_test' into testing