ELF-20 revert removal of search