diff --git a/Check-Webhook/User.Bot.js b/Check-Webhook/User.Bot.js
index 3c6bb40..171f9e0 100644
--- a/Check-Webhook/User.Bot.js
+++ b/Check-Webhook/User.Bot.js
@@ -97,8 +97,13 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, FILE_S
                 try {
 
                     let http = require('http');
+                    let url =   'http://' + process.env.WEB_SERVER_URL +
+                                ':' + process.env.WEB_SERVER_PORT +
+                                '/Webhook/Fetch-Messages/' +
+                                bot.exchange + "/" +
+                                bot.market.baseAsset + "-" + bot.market.quotedAsset
 
-                    http.get('http://' + process.env.WEB_SERVER_URL + ':' + process.env.WEB_SERVER_PORT + '/Webhook/Fetch-Messages', onResponse);
+                    http.get(url, onResponse);
 
                     function onResponse(response) {
 
diff --git a/this.bot.config.json b/this.bot.config.json
index e05d6a9..bf9b802 100644
--- a/this.bot.config.json
+++ b/this.bot.config.json
@@ -33,7 +33,7 @@
         }
       },
       "deadWaitTime": 0,
-      "normalWaitTime": 60000,
+      "normalWaitTime": 30000,
       "retryWaitTime": 10000,
       "sleepWaitTime": 3600000,
       "comaWaitTime": 86400000,