Small editing to SearchCmd2