bug fixes also now handles --search and --get