Fixed Keyword search functions
 Please enter the commit message for your changes. Lines starting