Added support for more complex search expressions.