Simplify sequencing of handle_query_channel_range