diff --git a/bip-0021.mediawiki b/bip-0021.mediawiki
index 5512a01b..fba47f3a 100644
--- a/bip-0021.mediawiki
+++ b/bip-0021.mediawiki
@@ -41,10 +41,12 @@ Elements of the query component may contain characters outside the valid range.
  bitcoinparams  = bitcoinparam [ "&" bitcoinparams ]
  bitcoinparam   = amountparam | labelparam | messageparam | otherparam | reqparam
  amountparam    = "amount=" *digit [ "." *digit ]
- labelparam     = "label=" *pchar
- messageparam   = "message=" *pchar
- otherparam     = pchar *pchar "=" *pchar
- reqparam       = "req-" pchar *pchar "=" *pchar
+ labelparam     = "label=" *qchar
+ messageparam   = "message=" *qchar
+ otherparam     = qchar *qchar "=" *qchar
+ reqparam       = "req-" qchar *qchar "=" *qchar
+
+Here, "qchar" corresponds to valid characters of an RFC 3986 URI query component, excluding the "=" and "&" characters, which this BIP takes as separators.
 
 === Query Keys ===