added support for search by keywords