refactor Search module to remove unnecessary Strategy class