Add CICategoryGenerator filters

Also renamed the singular filter generator.