diff --git a/pkg/apis/compute/guests.go b/pkg/apis/compute/guests.go
index 87a28aae8f..803d2435af 100644
--- a/pkg/apis/compute/guests.go
+++ b/pkg/apis/compute/guests.go
@@ -305,6 +305,9 @@ func (self ServerDetails) GetMetricTags() map[string]string {
 	}
 	for k, v := range self.Metadata {
 		if strings.HasPrefix(k, db.USER_TAG_PREFIX) {
+			if strings.Contains(k, "login_key") || strings.Contains(v, "=") {
+				continue
+			}
 			ret[k] = v
 		}
 	}
diff --git a/pkg/cloudcommon/cronman/cronman.go b/pkg/cloudcommon/cronman/cronman.go
index a54c9e74fb..065284e7aa 100644
--- a/pkg/cloudcommon/cronman/cronman.go
+++ b/pkg/cloudcommon/cronman/cronman.go
@@ -447,7 +447,7 @@ func (job *SCronJob) runJobInWorker(isStart bool, startTime time.Time) {
 		}
 	}()
 
-	log.Debugf("Cron job: %s started, startTime: %s", job.Name, startTime)
+	log.Debugf("Cron job: %s started, startTime: %s", job.Name, startTime.Format(time.RFC3339))
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, appctx.APP_CONTEXT_KEY_APPNAME, fmt.Sprintf("%s/cron-service", consts.GetServiceName()))
 	ctx = context.WithValue(ctx, appctx.APP_CONTEXT_KEY_TASKNAME, fmt.Sprintf("%s-%d", job.Name, time.Now().Unix()))
diff --git a/pkg/cloudmon/resources/resources.go b/pkg/cloudmon/resources/resources.go
index 4b3d69f39f..b6fda668c8 100644
--- a/pkg/cloudmon/resources/resources.go
+++ b/pkg/cloudmon/resources/resources.go
@@ -171,9 +171,9 @@ func (self *SBaseResources) init(ctx context.Context) error {
 
 func (self *SBaseResources) increment(ctx context.Context) error {
 	s := auth.GetAdminSession(ctx, options.Options.Region)
-	timeFilter := fmt.Sprintf("imported_at.gt('%s')", self.importedAt)
+	timeFilter := fmt.Sprintf("imported_at.gt('%s')", self.importedAt.Format(time.RFC3339))
 	if self.importedAt.IsZero() {
-		timeFilter = fmt.Sprintf("created_at.gt('%s')", self.createdAt)
+		timeFilter = fmt.Sprintf("created_at.gt('%s')", self.createdAt.Format(time.RFC3339))
 	}
 	query := map[string]interface{}{
 		"limit":      20,
@@ -239,7 +239,7 @@ func (self *SBaseResources) increment(ctx context.Context) error {
 
 func (self *SBaseResources) decrement(ctx context.Context) error {
 	s := auth.GetAdminSession(ctx, options.Options.Region)
-	timeFilter := fmt.Sprintf("deleted_at.gt('%s')", self.deletedAt)
+	timeFilter := fmt.Sprintf("deleted_at.gt('%s')", self.deletedAt.Format(time.RFC3339))
 	query := map[string]interface{}{
 		"limit":      20,
 		"scope":      "system",
@@ -271,6 +271,7 @@ func (self *SBaseResources) decrement(ctx context.Context) error {
 		baseInfo := sBaseInfo{}
 		ret[i].Unmarshal(&baseInfo)
 		if len(baseInfo.ExternalId) == 0 && self.manager.GetKeyword() != compute.Cloudproviders.GetKeyword() &&
+			self.manager.GetKeyword() != compute.Cloudaccounts.GetKeyword() &&
 			self.manager.GetKeyword() != identity.Projects.GetKeyword() {
 			continue
 		}
@@ -301,7 +302,7 @@ func (self *SBaseResources) decrement(ctx context.Context) error {
 
 func (self *SBaseResources) update(ctx context.Context) error {
 	s := auth.GetAdminSession(ctx, options.Options.Region)
-	timeFilter := fmt.Sprintf("updated_at.gt('%s')", self.updatedAt)
+	timeFilter := fmt.Sprintf("updated_at.gt('%s')", self.updatedAt.Format(time.RFC3339))
 	query := map[string]interface{}{
 		"limit":          20,
 		"scope":          "system",
@@ -334,10 +335,10 @@ func (self *SBaseResources) update(ctx context.Context) error {
 		if self.manager.GetKeyword() == identity.Projects.GetKeyword() {
 			projectTags.SetTags(baseInfo.Id, baseInfo.Metadata)
 		}
-		if len(baseInfo.ExternalId) == 0 {
-			continue
-		}
 		key := baseInfo.ExternalId
+		if len(key) == 0 {
+			key = baseInfo.Id
+		}
 		self.resourceLock.Lock()
 		self.Resources[key] = ret[i]
 		self.resourceLock.Unlock()