Added support for advanced searching options