Fix search implementation behavior