diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html
index ed94fd566..1cdbbb150 100644
--- a/client/htmls/private/ajax/Settings/providerSync.html
+++ b/client/htmls/private/ajax/Settings/providerSync.html
@@ -1938,9 +1938,19 @@ <h4 class="modal-title">Importing Instances</h4>
                     var bgTagName = $(this).find('.bgTagName').val();
                     updateUniqueInstanceTagsObj["id"] = instanceId;
                     updateUniqueInstanceTagsObj["tags"] = {};
-                    updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
-                    updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
-                    updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
+                    if(projectTagName === '' &&  envTagName === '' && bgTagName ===''){
+                        bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags");
+                        return false;
+                    }
+                    if(projectTagName !== ''){
+                        updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
+                    }
+                    if(envTagName !== ''){
+                        updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
+                    }
+                    if(bgTagName !== ''){
+                        updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
+                    }
                     updateInstanceTagsArr.push(updateUniqueInstanceTagsObj);
                 });
                 updateInstanceTagsObj["instances"] = updateInstanceTagsArr;
@@ -1964,6 +1974,7 @@ <h4 class="modal-title">Importing Instances</h4>
                 });
             }else{
                 bootbox.alert("Please select corresponding check-box for updating tags");
+                return false;
             }
         });
 
@@ -1983,11 +1994,21 @@ <h4 class="modal-title">Importing Instances</h4>
                     var projectTagName = $(this).find('.projectTagName').val();
                     var envTagName = $(this).find('.envTagName').val();
                     var bgTagName = $(this).find('.bgTagName').val();
-                    updateUniqueBucketTagsObj["id"] = instanceId;
+                    updateUniqueBucketTagsObj["id"] = resourceId;
                     updateUniqueBucketTagsObj["tags"] = {};
-                    updateUniqueBucketTagsObj["tags"][projectTagsMapName] = projectTagName;
-                    updateUniqueBucketTagsObj["tags"][envTagsMapName] = envTagName;
-                    updateUniqueBucketTagsObj["tags"][bgTagsMapName] = bgTagName;
+                    if(projectTagName === '' &&  envTagName === '' && bgTagName ===''){
+                        bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags");
+                        return false;
+                    }
+                    if(projectTagName !== ''){
+                        updateUniqueBucketTagsObj["tags"][projectTagsMapName] = projectTagName;
+                    }
+                    if(envTagName !== ''){
+                        updateUniqueBucketTagsObj["tags"][envTagsMapName] = envTagName;
+                    }
+                    if(bgTagName !== ''){
+                        updateUniqueBucketTagsObj["tags"][bgTagsMapName] = bgTagName;
+                    }
                     updateBucketTagsArr.push(updateUniqueBucketTagsObj);
                 });
                 updateBucketTagsObj["resources"] = updateBucketTagsArr;
@@ -2009,6 +2030,7 @@ <h4 class="modal-title">Importing Instances</h4>
                 });
             }else{
                 bootbox.alert("Please select corresponding check-box for updating tags");
+                return false;
             }
         });
 
@@ -2028,11 +2050,21 @@ <h4 class="modal-title">Importing Instances</h4>
                     var projectTagName = $(this).find('.projectTagName').val();
                     var envTagName = $(this).find('.envTagName').val();
                     var bgTagName = $(this).find('.bgTagName').val();
-                    updateUniqueDBTagsObj["id"] = instanceId;
+                    updateUniqueDBTagsObj["id"] = resourceId;
                     updateUniqueDBTagsObj["tags"] = {};
-                    updateUniqueDBTagsObj["tags"][projectTagsMapName] = projectTagName;
-                    updateUniqueDBTagsObj["tags"][envTagsMapName] = envTagName;
-                    updateUniqueDBTagsObj["tags"][bgTagsMapName] = bgTagName;
+                    if(projectTagName === '' &&  envTagName === '' && bgTagName ===''){
+                        bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags");
+                        return false;
+                    }
+                    if(projectTagName !== ''){
+                        updateUniqueDBTagsObj["tags"][projectTagsMapName] = projectTagName;
+                    }
+                    if(envTagName !== ''){
+                        updateUniqueDBTagsObj["tags"][envTagsMapName] = envTagName;
+                    }
+                    if(bgTagName !== ''){
+                        updateUniqueDBTagsObj["tags"][bgTagsMapName] = bgTagName;
+                    }
                     updateDBTagsArr.push(updateUniqueDBTagsObj);
                 });
                 updateDBTagsObj["resources"] = updateDBTagsArr;
@@ -2055,6 +2087,7 @@ <h4 class="modal-title">Importing Instances</h4>
                 });
             }else{
                 bootbox.alert("Please select corresponding check-box for updating tags");
+                return false;
             }
 
         });
diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js
index 9f38a0174..771fe231c 100644
--- a/client/htmls/public/js/awsCapacity.js
+++ b/client/htmls/public/js/awsCapacity.js
@@ -461,9 +461,19 @@ $(document).ready(function() {
                         }
                         updateUniqueInstanceTagsObj["id"] = instanceId;
                         updateUniqueInstanceTagsObj["tags"] = {};
-                        updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
-                        updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
-                        updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
+                        if(projectTagName === '' &&  envTagName === '' && bgTagName ===''){
+                            toastr.error("Please update tag value in any text-box corresponding to selected check-box for updating tags");
+                            return false;
+                        }
+                        if(projectTagName !== ''){
+                            updateUniqueInstanceTagsObj["tags"][projectTagsMapName] = projectTagName;
+                        }
+                        if(envTagName !== ''){
+                            updateUniqueInstanceTagsObj["tags"][envTagsMapName] = envTagName;
+                        }
+                        if(bgTagName !== ''){
+                            updateUniqueInstanceTagsObj["tags"][bgTagsMapName] = bgTagName;
+                        }
                         updateInstanceTagsArr.push(updateUniqueInstanceTagsObj);
                         updateInstanceTagsObj["instances"] = updateInstanceTagsArr;
                         $.ajax({
@@ -497,6 +507,7 @@ $(document).ready(function() {
             });
         } else {
             toastr.error("Please select corresponding check-box for updating tags");
+            return false;
         }
     });
 });
\ No newline at end of file
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index 84cae72c0..4b024e28b 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -2343,7 +2343,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                             "orgname": bodyJson['orgname'],
                                             "domainname": bodyJson['domainname'],
                                             "rowid": bodyJson['rowid'],
-                                            "plannedCost":bodyJson['plannedCost'].toFixed(2),
+                                            "plannedCost":bodyJson['plannedCost'],
                                             "id": "1"
                                         }
                                         var orgObj = new d4dModelNew.d4dModelMastersOrg(orgData);
@@ -2740,9 +2740,6 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                     var currowid = bodyJson["rowid"];
                                     delete rowtoedit._id; //fixing the issue of
                                     logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit));
-                                    if(rowtoedit.plannedCost){
-                                        rowtoedit.plannedCost =rowtoedit.plannedCost.toFixed(2);
-                                    }
                                     eval('d4dModelNew.' + dbtype).update({
                                         rowid: bodyJson["rowid"]
                                     }, {
diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js
index 0bf7c1ad3..c0cee7cde 100644
--- a/server/app/routes/v1.0/routes_provider.js
+++ b/server/app/routes/v1.0/routes_provider.js
@@ -2151,6 +2151,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 	// TODO Use async to reduce callbacks
 	app.post('/aws/providers', function(req, res) {
 		logger.debug("Enter post() for /providers.", typeof req.body.fileName);
+		logger.debug("Req Body for providers ", JSON.stringify(req.body));
 		var user = req.session.user;
 		var category = configmgmtDao.getCategoryFromID("9");
 		var permissionto = 'create';
@@ -2442,6 +2443,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 	// Update a particular AWS Provider
 	app.post('/aws/providers/:providerId/update', function(req, res) {
 		logger.debug("Enter post() for /providers/%s/update", req.params.providerId);
+		logger.debug("Req Body for providers ", JSON.stringify(req.body));
 		var user = req.session.user;
 		var category = configmgmtDao.getCategoryFromID("9");
 		var permissionto = 'modify';