Added support for advanced searching