Added support for additional search critiera