FileFinder: Fixes for new Kite stack.
ContentSearch: Fixes for new Kite stack.