Various Search CLI Improvements

Jake, if you do a `git pull --rebase upstream master` on this branch and then push it up this should be cleaner and have only my commits on it.