Try to prevent stuff from moving around when switching from local to server search and back
Authored by: Jean-Francois Dockes 2014-11-10
Parent(s): [32fc6d]
Child(ren): [fce7fb]
