Comment cleanup for handling query_channel_range