Changed search to be more robust including like words and searching keywords.