Search box hueristic fixes
#1988

ericronne wants to merge 1759-explorer-search-box-improvements into develop

We do not currently have an analysis of these two commits