addresses #10028
merged with master
fixing merge
Merge pull request #263 from berkmancenter/search_fixes

addresses #10028