More work on the CLI and fix up the API key filter