Add ability to filter by CBO

'All' not implemented