Add command line search
remove credentials