diff --git a/Message/Http/Request.php b/Message/Http/Request.php
index 65581a25a..3036fcf88 100644
--- a/Message/Http/Request.php
+++ b/Message/Http/Request.php
@@ -204,6 +204,8 @@ class Request extends RequestAbstract
         UriFactory::setQuery('/scheme', $this->uri->getScheme());
         UriFactory::setQuery('/host', $this->uri->getHost());
         UriFactory::setQuery('/lang', $this->l11n->getLanguage());
+        UriFactory::setQuery('?', $this->uri->getQuery());
+        UriFactory::setQuery('%', $this->uri->__toString());
     }
 
     /**