[search] fix some glitches