fix/cleanup channel list handling