diff --git a/Documentation/Books/bot.py b/Documentation/Books/bot.py
index df8f0a140c..34b0a72d49 100644
--- a/Documentation/Books/bot.py
+++ b/Documentation/Books/bot.py
@@ -40,14 +40,15 @@ def replaceText(text, pathOfFile, searchText):
 
   # HTTP API changing code
   replaced = replaced.replace("@brief","")
-  replaced = re.sub(r"@RESTHEADER{([\s\w\/-]*),([\s\w]*)}", r"###\g<2>\n `\g<1>", replaced)
+  replaced = re.sub(r"@RESTHEADER{([\s\w\/\_-]*),([\s\w]*)}", r"###\g<2>\n `\g<1>`", replaced)
   replaced = replaced.replace("@RESTDESCRIPTION","")
   replaced = replaced.replace("@RESTURLPARAMS","*URL Parameters*\n")
   replaced = replaced.replace("@RESTQUERYPARAMS","*Query Parameters*\n")
   replaced = replaced.replace("@RESTHEADERPARAMS","*Header Parameters*\n")
   replaced = replaced.replace("@RESTBODYPARAMS","*Body Parameters*\n")
   replaced = replaced.replace("@RESTRETURNCODES","*Return Codes*")
-  replaced = re.sub(r"@RESTPARAM{([\s\w]*),([\s\w]*),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced)
+  replaced = re.sub(r"@RESTPARAM{([\s\w\-]*),([\s\w\_\|-]*),\s[optional]}", r"* *\g<1>* (\g<3>):", replaced)
+  replaced = re.sub(r"@RESTPARAM{([\s\w-]*),([\s\w\_\|-]*),\s*(\w+)}", r"* *\g<1>*:", replaced)
   #  replaced = re.sub(r"@RESTPARAM{(\s*\w+\-*\w+),(\s*\w+),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced)
   replaced = re.sub(r"@RESTRETURNCODE{(.*)}", r"* *HTTP \g<1>*:", replaced)
   replaced = re.sub(r"@RESTBODYPARAMS{(.*)}", r"*(\g<1>)*", replaced)