Added support for multiple search terms