Added support for new search modes