diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 7430e17fc..e6845f740 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -287,6 +287,13 @@
             $modalInstance.dismiss('cancel');
         };
     }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
+        if(items.isBotScheduled === true){
+            $scope._isEventSelected = true;
+            $scope.isScheduled = true;
+        }else{
+            $scope._isEventSelected = false;
+            $scope.isScheduled = false;
+        }
         $scope.scheduleDeatils = items;
         $scope.botId = items.botId;
         $scope.defaultSelection = function() {
@@ -294,7 +301,13 @@
             $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY');
             $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY');
         };
-        
+        $scope.selectBotCheckbox = function(){
+            if($scope.isScheduled === true || $scope.isScheduled === 'true') {
+                $scope._isEventSelected = true;
+            }else{
+                $scope._isEventSelected = false;
+            }
+        }
         if(items.botScheduler){
             if(items.botScheduler.cronStartOn && items.botScheduler.cronEndOn) {
                 var newStartOn = parseInt(items.botScheduler.cronStartOn);
@@ -364,9 +377,17 @@
                 cronDate: $scope.selectedDayOfTheMonth,
                 cronMonth: $scope.selectedMonth
             };
-            var reqBody = {
-                botScheduler:$scope.eventParams,
-                isBotScheduled:true
+            var reqBody = null;
+            if($scope.isScheduled === true || $scope.isScheduled === 'true'){
+                 reqBody = {
+                    botScheduler:$scope.eventParams,
+                    isBotScheduled:true
+                }
+            }else{
+                 reqBody = {
+                    botScheduler:{},
+                    isBotScheduled:false
+                }
             }
             var param={
                 url:'/bots/' + $scope.botId + '/scheduler',
@@ -457,7 +478,7 @@
                 $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData';
                 $scope.taskHistoryJenkinsGridOptions.columnDefs = [
                     { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'<a target="_blank" title="Jenkins" ng-href="{{grid.appScope.task.taskConfig.jobURL}}/{{row.entity.auditTrailConfig.jenkinsBuildNumber}}">{{row.entity.auditTrailConfig.jenkinsBuildNumber}}</a>', sort:{ direction: 'desc'}, cellTooltip: true},
-                    { name:'Job Output',cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
+                    { name:'Job Output',cellTemplate:'<span><a target="_blank" title="{{jobResultUrlName}}" class="fa fa-file-text bigger-120 btn cat-btn-update btn-sg tableactionbutton marginbottomright3" ng-repeat="jobResultUrlName in row.entity.auditTrailConfig.jobResultURL" ng-href="{{jobResultUrlName}}"></a></span>',cellTooltip: true},
                     { name:'Log Info',width: 90,cellTemplate:'<span title="Jenkins Log" class="fa fa-list bigger-120 btn cat-btn-update btn-sg tableactionbutton" ng-click="grid.appScope.historyLogs(row.entity);"></span>',cellTooltip: true},
                     { name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status.toUpperCase()}}">{{row.entity.status.toUpperCase()}}</div>'},
                     { name:'Start Time',field:'startedOn',cellTemplate:'<span title="{{row.entity.startedOn  | timestampToLocaleTime}}">{{row.entity.startedOn  | timestampToLocaleTime}}</span>',cellTooltip: true},
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html b/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html
index 014c1901b..855fe5333 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botSchedule.html
@@ -4,21 +4,34 @@
          <span class="close" ng-click="cancel()">×</span>
          <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h4>
       </div>
+
       <div class="modal-body">
+              <div class="col-lg-6 col-md-6 margintop15">
+              <label>Do you want to Schedule BOTs? </label>
+              </div>
+              <div class="col-lg-6 col-md-6 margintop15">
+                  <input type="radio" ng-value="true"  ng-model="isScheduled" name="isScheduled" ng-click="selectBotCheckbox()" />
+                  <label for="isScheduled" class="paddingright15">Yes</label>
+                  <input type="radio" ng-value="false"  ng-model="isScheduled" name="isScheduled" ng-click="selectBotCheckbox()" />
+                  <label for="isScheduled" class="paddingright15">No</label>
+              </div>
+
          <!--dropdown for selecting the repeat type-->
-         <div class="col-lg-6 col-md-6 ">
+
+         <div class="col-lg-6 col-md-6 " ng-show="_isEventSelected">
             <label>Starts on: <span class="red">*</span>
             </label>
-            <input id="date-start"  ng-change="dateChange()" required  type="text"  ng-model="schedulerStartOn" class="form-control-date"  >
+            <input id="date-start"  ng-change="dateChange()"   type="text"  ng-model="schedulerStartOn" class="form-control-date"  >
          </div>
-         <div class="col-lg-6 col-md-6 ">
+         <div class="col-lg-6 col-md-6 " ng-show="_isEventSelected">
             <label>Ends on: <span class="red">*</span>
             </label>
-            <input ng-change="dateChange()" type="text"  id="date-end" ng-model="schedulerEndOn" class="form-control-date" required >
+            <input ng-change="dateChange()" type="text"   id="date-end" ng-model="schedulerEndOn" class="form-control-date"  >
             <span class="error red" ng-show="validDateRange">Start Date should be less than End date !</span>
          </div>
+         <div class="clearfix margintop15 "></div>
          <div class="clearfix margintop15"></div>
-         <div class="clearfix margintop15"></div>
+          <div ng-show="_isEventSelected">
          <fieldset class="repo-job-details-wrapper">
             <legend class="repo-job-details-wrapper-inner"><i class="fa fa-hourglass-start" ></i> Interval </legend>
             <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
@@ -33,10 +46,10 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
                <label>Repeat By: <span class="red">*</span>
-                <span ng-show="newSchedule.repeatBy.$touched && newSchedule.repeatBy.$invalid" class="inputValidationMsg">required
+                <span ng-show="newSchedule.repeatBy.$touched && newSchedule.repeatBy.$invalid" class="inputValidationMsg">
                </span>
                </label>
-               <select name="repeatBy" class="form-control-date" ng-model="repeatBy" required>
+               <select name="repeatBy" class="form-control-date" ng-model="repeatBy" >
                   <option value="" selected="selected">Choose</option>
                   <option ng-repeat="repeatBy in repeatCount(30)" value="{{repeatBy}}" title="Repeat Every {{repeatBy}}">{{repeatBy}}</option>
                </select>
@@ -60,7 +73,7 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h
             <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 margintop10" ng-show="repeatsType!=='Minutes'">
                <label>Time(Hrs):
                <span class="red">&nbsp;*</span>
-               <span ng-show="newSchedule.timeEventHour.$touched && newSchedule.timeEventHour.$invalid" class="inputValidationMsg">required
+               <span ng-show="newSchedule.timeEventHour.$touched && newSchedule.timeEventHour.$invalid" class="inputValidationMsg">
                </span>
                </label>
                <select name="timeEventHour" class="form-control-date" ng-model="timeEventType">
@@ -71,7 +84,7 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h
             <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 margintop10" ng-show="repeatsType!=='Minutes'">
                <label>Time(Mins):
                <span class="red">&nbsp;*</span>
-               <span ng-show="newSchedule.timeEventMinute.$touched && newSchedule.timeEventMinute.$invalid" class="inputValidationMsg">required
+               <span ng-show="newSchedule.timeEventMinute.$touched && newSchedule.timeEventMinute.$invalid" class="inputValidationMsg">
                </span>
                </label>
                <select name="timeEventMinute" class="form-control-date" ng-model="timeEventMinute">
@@ -83,7 +96,7 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h
             <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 margintop10" ng-show="repeatsType==='Weekly'">
                <label>Repeat On:
                <span class="control-label red">&nbsp;*</span>
-               <span ng-show="newSchedule.weekOfTheDay.$touched && newSchedule.weekOfTheDay.$invalid" class="inputValidationMsg">required
+               <span ng-show="newSchedule.weekOfTheDay.$touched && newSchedule.weekOfTheDay.$invalid" class="inputValidationMsg">
                </span>
                </label>
                <select name="weekOfTheDay" class="form-control-date" ng-model="weekOfTheDay">
@@ -96,7 +109,7 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h
             <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 margintop10" ng-show="repeatsType==='Monthly'">
                <label>Choose Date:
                <span class="control-label red">&nbsp;*</span>
-               <span ng-show="newSchedule.selectedDayOfTheMonth.$touched && newSchedule.selectedDayOfTheMonth.$invalid" class="inputValidationMsg">required
+               <span ng-show="newSchedule.selectedDayOfTheMonth.$touched && newSchedule.selectedDayOfTheMonth.$invalid" class="inputValidationMsg">
                </span>
                </label>
                <select name="selectedDayOfTheMonth" class="form-control-date" ng-model="selectedDayOfTheMonth">
@@ -108,6 +121,7 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Bot</h
             <!--starts at dropdown ends here-->
             <!--dropdown ends here-->
          </fieldset>
+          </div>
       </div>
       <div class="modal-footer">
          <button type="button" class="btn cat-btn-close" ng-click="cancel()">
diff --git a/server/app/model/audit-trail/bot-audit-trail.js b/server/app/model/audit-trail/bot-audit-trail.js
index 215b90f61..1c0cf258c 100644
--- a/server/app/model/audit-trail/bot-audit-trail.js
+++ b/server/app/model/audit-trail/bot-audit-trail.js
@@ -54,6 +54,10 @@ var BotAuditTrailSchema = new BaseAuditTrail({
             type: String,
             trim:true
         },
+        jobResultURL:{
+            type: [String],
+            trim:true
+        },
         manualExecutionTime:{
             type: Number,
             required: false
diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
index d6747e94b..5cf1deb7b 100755
--- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
+++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
@@ -607,7 +607,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
 
 
                                                 } else {
-                                                    if (code == 0) {
+                                                    if (code === 0) {
                                                         instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function (err, updateData) {
                                                             if (err) {
                                                                 logger.error("Unable to set instance bootstarp status. code 0", err);
@@ -654,123 +654,122 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
                                                                 }
                                                                 logger.debug("Domain name is updated successfully");
                                                             });
-                                                            instanceLog.endedOn = new Date().getTime();
-                                                            instanceLog.actionStatus = "success";
-                                                            instanceLog.logs = {
-                                                                err: false,
-                                                                log: "Instance Bootstrapped successfully",
-                                                                timestamp: new Date().getTime()
-                                                            };
-                                                            if (launchParams.auditTrailId !== null) {
-                                                                var resultTaskExecution = {
-                                                                    actionStatus: "success",
-                                                                    status: "success",
-                                                                    endedOn: new Date().getTime()
-                                                                }
-                                                                auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
-                                                                    if (err) {
-                                                                        logger.error("Failed to create or update bots Log: ", err);
-                                                                    }
-                                                                });
+                                                        }
+                                                        instanceLog.endedOn = new Date().getTime();
+                                                        instanceLog.actionStatus = "success";
+                                                        instanceLog.logs = {
+                                                            err: false,
+                                                            log: "Instance Bootstrapped successfully",
+                                                            timestamp: new Date().getTime()
+                                                        };
+                                                        if (launchParams.auditTrailId !== null) {
+                                                            var resultTaskExecution = {
+                                                                actionStatus: "success",
+                                                                status: "success",
+                                                                endedOn: new Date().getTime()
                                                             }
-                                                            instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded);
-                                                            launchParams.infraManager.getNode(instance.chefNodeName, function (err, nodeData) {
+                                                            auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
                                                                 if (err) {
-                                                                    logger.error("Failed chef.getNode", err);
-                                                                    return;
-                                                                }
-                                                                instanceLog.platform = nodeData.automatic.platform;
-                                                                instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
-                                                                    if (err) {
-                                                                        logger.error("Failed to create or update instanceLog: ", err);
-                                                                    }
-                                                                });
-                                                                var hardwareData = {};
-                                                                hardwareData.architecture = nodeData.automatic.kernel.machine;
-                                                                hardwareData.platform = nodeData.automatic.platform;
-                                                                hardwareData.platformVersion = nodeData.automatic.platform_version;
-                                                                hardwareData.memory = {
-                                                                    total: 'unknown',
-                                                                    free: 'unknown'
-                                                                };
-                                                                if (nodeData.automatic.memory) {
-                                                                    hardwareData.memory.total = nodeData.automatic.memory.total;
-                                                                    hardwareData.memory.free = nodeData.automatic.memory.free;
+                                                                    logger.error("Failed to create or update bots Log: ", err);
                                                                 }
-                                                                hardwareData.os = instance.hardware.os;
-                                                                instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) {
-                                                                    if (err) {
-                                                                        logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
-                                                                    } else {
-                                                                        logger.debug("Instance hardware details set successessfully");
-                                                                    }
-                                                                });
-                                                                //Checking docker status and updating
-                                                                var _docker = new Docker();
-                                                                _docker.checkDockerStatus(instance.id,
-                                                                    function (err, retCode) {
-                                                                        if (err) {
-                                                                            logger.error("Failed _docker.checkDockerStatus", err);
-                                                                            res.send(500);
-                                                                            return;
-                                                                            //res.end('200');
-
-                                                                        }
-                                                                        logger.debug('Docker Check Returned:' + retCode);
-                                                                        if (retCode == '0') {
-                                                                            instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) {
-                                                                                logger.debug('Instance Docker Status set to Success');
-                                                                            });
-
-                                                                        }
-                                                                    });
-
                                                             });
-
-                                                        } else {
-                                                            instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
+                                                        }
+                                                        instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded);
+                                                        launchParams.infraManager.getNode(instance.chefNodeName, function (err, nodeData) {
+                                                            if (err) {
+                                                                logger.error("Failed chef.getNode", err);
+                                                                return;
+                                                            }
+                                                            instanceLog.platform = nodeData.automatic.platform;
+                                                            instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
                                                                 if (err) {
-                                                                    logger.error("Unable to set instance bootstarp status code != 0", err);
-                                                                } else {
-                                                                    logger.debug("Instance bootstrap status set to failed");
+                                                                    logger.error("Failed to create or update instanceLog: ", err);
                                                                 }
                                                             });
-                                                            instanceLog.endedOn = new Date().getTime();
-                                                            instanceLog.actionStatus = "failed";
-                                                            instanceLog.logs = {
-                                                                err: false,
-                                                                log: "Bootstrap Failed",
-                                                                timestamp: new Date().getTime()
+                                                            var hardwareData = {};
+                                                            hardwareData.architecture = nodeData.automatic.kernel.machine;
+                                                            hardwareData.platform = nodeData.automatic.platform;
+                                                            hardwareData.platformVersion = nodeData.automatic.platform_version;
+                                                            hardwareData.memory = {
+                                                                total: 'unknown',
+                                                                free: 'unknown'
                                                             };
-                                                            instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
+                                                            if (nodeData.automatic.memory) {
+                                                                hardwareData.memory.total = nodeData.automatic.memory.total;
+                                                                hardwareData.memory.free = nodeData.automatic.memory.free;
+                                                            }
+                                                            hardwareData.os = instance.hardware.os;
+                                                            instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) {
                                                                 if (err) {
-                                                                    logger.error("Failed to create or update instanceLog: ", err);
+                                                                    logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
+                                                                } else {
+                                                                    logger.debug("Instance hardware details set successessfully");
                                                                 }
                                                             });
-                                                            if (launchParams.auditTrailId !== null) {
-                                                                var resultTaskExecution = {
-                                                                    actionStatus: "failed",
-                                                                    status: "failed",
-                                                                    endedOn: new Date().getTime()
-                                                                }
-                                                                auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
+                                                            //Checking docker status and updating
+                                                            var _docker = new Docker();
+                                                            _docker.checkDockerStatus(instance.id,
+                                                                function (err, retCode) {
                                                                     if (err) {
-                                                                        logger.error("Failed to create or update bot Log: ", err);
+                                                                        logger.error("Failed _docker.checkDockerStatus", err);
+                                                                        res.send(500);
+                                                                        return;
+                                                                        //res.end('200');
+
+                                                                    }
+                                                                    logger.debug('Docker Check Returned:' + retCode);
+                                                                    if (retCode == '0') {
+                                                                        instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) {
+                                                                            logger.debug('Instance Docker Status set to Success');
+                                                                        });
+
                                                                     }
                                                                 });
+
+                                                        });
+
+                                                    }else {
+                                                        instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
+                                                            if (err) {
+                                                                logger.error("Unable to set instance bootstarp status code != 0", err);
+                                                            } else {
+                                                                logger.debug("Instance bootstrap status set to failed");
                                                             }
-                                                            var timestampEnded = new Date().getTime();
-                                                            logsDao.insertLog({
-                                                                referenceId: logsReferenceIds,
-                                                                err: false,
-                                                                log: "Bootstrap Failed",
-                                                                timestamp: timestampEnded
+                                                        });
+                                                        instanceLog.endedOn = new Date().getTime();
+                                                        instanceLog.actionStatus = "failed";
+                                                        instanceLog.logs = {
+                                                            err: false,
+                                                            log: "Bootstrap Failed",
+                                                            timestamp: new Date().getTime()
+                                                        };
+                                                        instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
+                                                            if (err) {
+                                                                logger.error("Failed to create or update instanceLog: ", err);
+                                                            }
+                                                        });
+                                                        if (launchParams.auditTrailId !== null) {
+                                                            var resultTaskExecution = {
+                                                                actionStatus: "failed",
+                                                                status: "failed",
+                                                                endedOn: new Date().getTime()
+                                                            }
+                                                            auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
+                                                                if (err) {
+                                                                    logger.error("Failed to create or update bot Log: ", err);
+                                                                }
                                                             });
-                                                            instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded);
                                                         }
+                                                        var timestampEnded = new Date().getTime();
+                                                        logsDao.insertLog({
+                                                            referenceId: logsReferenceIds,
+                                                            err: false,
+                                                            log: "Bootstrap Failed",
+                                                            timestamp: timestampEnded
+                                                        });
+                                                        instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded);
                                                     }
                                                 }
-
                                             }, function (stdOutData) {
 
                                                 instanceLog.logs = {
diff --git a/server/app/model/classes/tasks/taskTypeChef.js b/server/app/model/classes/tasks/taskTypeChef.js
index 29975a973..cd2b6d823 100755
--- a/server/app/model/classes/tasks/taskTypeChef.js
+++ b/server/app/model/classes/tasks/taskTypeChef.js
@@ -269,9 +269,16 @@ chefTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, appDat
                     });
                 });
 
-            } else if (tagServer !== 'undefined' && tagServer !== null) {
-                logger.debug('in tagServer',tagServer);
-                instancesDao.getInstancesByTagServer(tagServer, function(err, instances) {
+            } else  if ((typeof tagServer === 'string' && tagServer === 'undefined') || typeof tagServer === 'undefined') {
+                if (!(instanceIds && instanceIds.length)) {
+                    if (typeof onExecute === 'function') {
+                        onExecute({
+                            message: "Empty Node List"
+                        }, null);
+                    }
+                    return;
+                }
+                instancesDao.getInstances(instanceIds, function (err, instances) {
                     if (err) {
                         logger.error(err);
                         if (typeof onExecute === 'function') {
@@ -283,16 +290,8 @@ chefTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, appDat
                 });
 
             } else {
-
-                if (!(instanceIds && instanceIds.length)) {
-                    if (typeof onExecute === 'function') {
-                        onExecute({
-                            message: "Empty Node List"
-                        }, null);
-                    }
-                    return;
-                }
-                instancesDao.getInstances(instanceIds, function(err, instances) {
+                logger.debug('in tagServer', tagServer);
+                instancesDao.getInstancesByTagServer(tagServer, function (err, instances) {
                     if (err) {
                         logger.error(err);
                         if (typeof onExecute === 'function') {
@@ -303,7 +302,6 @@ chefTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, appDat
                     callback(null, instances);
                 });
             }
-
         }
         logger.debug('role ==>', self.role);
         getInstances(self.role, instanceIds, self.botTagServer, function(err, instances) {
diff --git a/server/app/model/classes/tasks/taskTypeScript.js b/server/app/model/classes/tasks/taskTypeScript.js
index 492653555..d74cecee9 100644
--- a/server/app/model/classes/tasks/taskTypeScript.js
+++ b/server/app/model/classes/tasks/taskTypeScript.js
@@ -68,9 +68,16 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu
     var scriptDetails = this.scriptDetails;
     var instanceResultList = [];
     function getInstances(instanceIds, tagServer, callback) {
-        if (tagServer !== 'undefined' && tagServer !== null) {
-            logger.debug('in tagServer', tagServer);
-            instancesDao.getInstancesByTagServer(tagServer, function (err, instances) {
+        if ((typeof tagServer === 'string' && tagServer === 'undefined') || typeof tagServer === 'undefined') {
+            if (!(instanceIds && instanceIds.length)) {
+                if (typeof onExecute === 'function') {
+                    onExecute({
+                        message: "Empty Node List"
+                    }, null);
+                }
+                return;
+            }
+            instancesDao.getInstances(instanceIds, function (err, instances) {
                 if (err) {
                     logger.error(err);
                     if (typeof onExecute === 'function') {
@@ -80,17 +87,9 @@ scriptTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nexu
                 }
                 callback(null, instances);
             });
-
         } else {
-            if (!(instanceIds && instanceIds.length)) {
-                if (typeof onExecute === 'function') {
-                    onExecute({
-                        message: "Empty Node List"
-                    }, null);
-                }
-                return;
-            }
-            instancesDao.getInstances(instanceIds, function (err, instances) {
+            logger.debug('in tagServer', tagServer);
+            instancesDao.getInstancesByTagServer(tagServer, function (err, instances) {
                 if (err) {
                     logger.error(err);
                     if (typeof onExecute === 'function') {
diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js
index 03fb2d04a..6aa1e548c 100755
--- a/server/app/model/classes/tasks/tasks.js
+++ b/server/app/model/classes/tasks/tasks.js
@@ -376,7 +376,8 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b
                 "endedOn":self.timestampEnded,
                 "actionLogId":taskHistory.jenkinsServerId,
                 "auditTrailConfig.jenkinsBuildNumber":taskHistory.buildNumber,
-                "auditTrailConfig.jenkinsJobName":taskHistory.jobName
+                "auditTrailConfig.jenkinsJobName":taskHistory.jobName,
+                "auditTrailConfig.jobResultURL":taskHistory.jobResultURL
             };
         }else{
             resultTaskExecution = {
diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js
index bb69680ad..713850460 100644
--- a/server/app/services/botsService.js
+++ b/server/app/services/botsService.js
@@ -51,8 +51,8 @@ botsService.createOrUpdateBots = function createOrUpdateBots(botsDetail,linkedCa
         botLinkedCategory: linkedCategory,
         botLinkedSubCategory:linkedSubCategory,
         manualExecutionTime:botsDetail.manualExecutionTime,
-        version:botsDetail.version,
-        domainNameCheck:botsDetail.domainNameCheck,
+        version:botsDetail.version ? botsDetail.version : 1,
+        domainNameCheck:botsDetail.domainNameCheck ? botsDetail.domainNameCheck : false,
         createdOn: new Date().getTime()
     };
     bots.getBotsById(botsDetail._id,function(err,data){