Fix the Search CLI tool