[JC] Content-1765 Passing a search context through to be used for file type search filtering
[JC] Content-1765 Refactoring search internals to reduce number of parameters for certain methods.
[JC] Content-1765 Removing unused variable