Improve overriding of search page.
Merge branch '5184' of github.com:openscholar/openscholar into 5184