Fix up the CLI and also fix up the API key filter