Change the way we handle the "#' in channel names
More channel name changes