Improve CLI browse tool