escape the search string
add includeFiles method
refactoring