Reverting commit 469edb703d , don't understand the meaning of this, but search display was no more as expected