Fixed search CLI