*8235* Search refactoring