Added support for specific keywords search