diff --git a/content/docs/rfcs/10/README.md b/content/docs/rfcs/10/README.md
index 9e5302f9..7ac5a7f8 100644
--- a/content/docs/rfcs/10/README.md
+++ b/content/docs/rfcs/10/README.md
@@ -323,6 +323,7 @@ This includes Waku v1 specs, as they are used for bridging between the two netwo
 |[17/WAKU2-RLNRELAY](/spec/17)|🚧|||
 |[18/WAKU2-SWAP](/spec/18)|🚧|||
 |[19/WAKU2-LIGHTPUSH](/spec/19)|✔| |✔\**|✔\**|
+|[21/WAKU2-FAULT-TOLERANT-STORE](/spec/21)|✔|||
 
 *js-waku implements [13/WAKU2-STORE](/spec/13) as a querying node only.
 **js-waku only implements [19/WAKU2-LIGHTPUSH](/spec/19) requests.
diff --git a/content/docs/rfcs/21/README.md b/content/docs/rfcs/21/README.md
index 0836967a..cd2655bf 100644
--- a/content/docs/rfcs/21/README.md
+++ b/content/docs/rfcs/21/README.md
@@ -2,7 +2,7 @@
 slug: 21
 title: 21/WAKU2-FAULT-TOLERANT-STORE
 name: Waku v2 Fault-Tolerant Store
-status: raw
+status: draft
 editor: Sanaz Taheri <sanaz@status.im>
 contributors:
 ---
@@ -48,13 +48,16 @@ RPC call to query historical messages.
   This field holds the Unix epoch time.  
   The `messages` field of the corresponding [`HistoryResponse`](/spec/13#HistoryResponse) MUST contain historical waku messages whose [`timestamp`](/spec/14#Payloads) is larger than or equal to the `start_time`.
 - `end_time` this field MAY be filled out to signify the ending point of the queried time window. 
-  This field holds the Unix epoch time. 
-  A time-based query is considered valid if its `end_time` is larger than or equal to the `start_time`. 
+  This field holds the Unix epoch time.
   The `messages` field of the corresponding [`HistoryResponse`](/spec/13#HistoryResponse) MUST contain historical waku messages whose [`timestamp`](/spec/14#Payloads) is less than or equal to the `end_time`.
 
-If both `start_time` and `end_time` are omitted then no time-window filter takes place. 
+  A time-based query is considered valid if its `end_time` is larger than or equal to the `start_time`. 
+  Queries that do not adhere to this condition will not get through e.g. an open-end time query in which the `start_time` is given but no  `end_time` is supplied is not valid. 
+  If both `start_time` and `end_time` are omitted then no time-window filter takes place. 
 
-In order to count for nodes asynchrony, and assuming that nodes may be out of sync for at most 20 seconds, the querying nodes SHOULD add an offset of 20 seconds to their offline time window. 
+
+
+In order to account for nodes asynchrony, and assuming that nodes may be out of sync for at most 20 seconds, the querying nodes SHOULD add an offset of 20 seconds to their offline time window. 
 That is if the original window is [`l`,`r`] then the history query SHOULD be made for `[start_time: l - 20s, end_time: r + 20s]`.
 
 Note that `HistoryQuery` preserves `AND` operation among the queried attributes. 
diff --git a/content/menu/index.md b/content/menu/index.md
index aa55bcde..98bac7d4 100644
--- a/content/menu/index.md
+++ b/content/menu/index.md
@@ -6,7 +6,6 @@ bookMenuLevels: 1
 - Raw
   - [17/WAKU2-RLNRELAY]({{< relref "/docs/rfcs/17/README.md" >}})
   - [20/TOY-ETH-PM]({{< relref "/docs/rfcs/20/README.md" >}})
-  - [21/WAKU2-FTSTORE]({{< relref "/docs/rfcs/21/README.md" >}})
   - [24/STATUS-CURATION]({{< relref "/docs/rfcs/24/README.md" >}})
   - [25/LIBP2P-DNS-DISCOVERY]({{< relref "/docs/rfcs/25/README.md" >}})
   - [28/STATUS-FEATURING]({{< relref "/docs/rfcs/28/README.md" >}})
@@ -22,6 +21,7 @@ bookMenuLevels: 1
   - [16/WAKU2-RPC]({{< relref "/docs/rfcs/16/README.md" >}})
   - [18/WAKU2-SWAP]({{< relref "/docs/rfcs/18/README.md" >}})
   - [19/WAKU2-LIGHTPUSH]({{< relref "/docs/rfcs/19/README.md" >}})
+  - [21/WAKU2-FTSTORE]({{< relref "/docs/rfcs/21/README.md" >}})
   - [22/TOY-CHAT]({{< relref "/docs/rfcs/22/README.md" >}})
   - [23/WAKU2-TOPICS]({{< relref "/docs/rfcs/23/README.md" >}})
   - [26/WAKU2-PAYLOAD]({{< relref "/docs/rfcs/26/README.md" >}})