Fix the search history emulation with stay