Fix CLI search
Remove use of yield_per which clashes with 'joined' load.