Fix search class