fix search command usage
fix conflict