Fix search from CL