Fixes to make ScholarTool run properly under SearchExpander