Added container search to the command line tool