Better handling of different channel prefixes