Fix search commands