Fixes for the CLI

There were several methods that the CLI was using that didn't exist in the client.
Not sure if we support filters on formulas yet, but if we do, we should look at using that to make this a bit more efficient.