Fix search method