Search strategy refactor