Channel/ChannelGroup filtering by publisher

Merge of Augusto's changes onto the XML channel changes and refactor of channel output.