Improve the channel matching regex