Fix up format of new CLI output to match old filters