Adding SOLR search related changes based on Keyword