Added support for contains, starts, and ends searches