build search query
fix null ref
Merge branch 'ryan' of github.com:rossdylan/mailicorn-backend into rossdylan