search: fixes, CLI now working