Reverting function to previous (functioning) state.
Merge pull request #1160 from jamalex/tweaks_from_nalanda_testing

Several tweaks to address issues identified during Nalanda testing
Merge branch 'release-0.11.1' into search_box_tweaks