diff --git a/07-routing-gossip.md b/07-routing-gossip.md
index 80116eef2..96f24c619 100644
--- a/07-routing-gossip.md
+++ b/07-routing-gossip.md
@@ -655,8 +655,11 @@ The receiver of `query_channel_range`:
 	cover the requested `first_blocknum` to `first_blocknum` plus
 	`number_of_blocks` minus one.
   - For each `reply_channel_range`:
-    - MUST set with `chain_hash` equal to that of `query_channel_range`,
+    - MUST set with `chain_hash` equal to that of `query_channel_range`.
+    - MUST set `first_blocknum` equal to checking first block number.
+    - MUST set `number_of_blocks` equal to checking number of blocks.
     - MUST encode a `short_channel_id` for every open channel it knows in blocks `first_blocknum` to `first_blocknum` plus `number_of_blocks` minus one.
+      - SHOULD set encoding types even if there is no channel_ids.
     - MUST limit `number_of_blocks` to the maximum number of blocks whose
       results could fit in `encoded_short_ids`
     - if does not maintain up-to-date channel information for `chain_hash`: