[SearchEngine] Fix latest rebase