diff --git a/pkg/cloudcommon/db/resourcebase.go b/pkg/cloudcommon/db/resourcebase.go
index c8ade4dcc9..96e3350181 100644
--- a/pkg/cloudcommon/db/resourcebase.go
+++ b/pkg/cloudcommon/db/resourcebase.go
@@ -13,7 +13,7 @@ import (
 type SResourceBase struct {
 	SModelBase
 
-	CreatedAt     time.Time `nullable:"false" created_at:"true" get:"user" list:"user"`
+	CreatedAt     time.Time `nullable:"false" created_at:"true" index:"true" get:"user" list:"user"`
 	UpdatedAt     time.Time `nullable:"false" updated_at:"true" list:"user"`
 	UpdateVersion int       `default:"0" nullable:"false" auto_version:"true" list:"user"`
 	DeletedAt     time.Time ``
diff --git a/pkg/cloudcommon/notifyclient/notify.go b/pkg/cloudcommon/notifyclient/notify.go
index b50daf0d0e..22ec42c24c 100644
--- a/pkg/cloudcommon/notifyclient/notify.go
+++ b/pkg/cloudcommon/notifyclient/notify.go
@@ -24,6 +24,7 @@ var (
 
 func init() {
 	notifyClientWorkerMan = appsrv.NewWorkerManager("NotifyClientWorkerManager", 1, 50, false)
+	templatesTable = make(map[string]*template.Template)
 }
 
 func getTemplateString(topic string, contType string, channel notify.TNotifyChannel) ([]byte, error) {
@@ -59,11 +60,12 @@ func getContent(topic string, contType string, data jsonutils.JSONObject) (strin
 	if err != nil {
 		return "", err
 	}
-	var buf *strings.Builder
-	err = tmpl.Execute(buf, data.Interface())
+	buf := strings.Builder{}
+	err = tmpl.Execute(&buf, data.Interface())
 	if err != nil {
 		return "", err
 	}
+	log.Debugf("notify.getContent %s %s %s %s", topic, contType, data, buf.String())
 	return buf.String(), nil
 }
 
diff --git a/pkg/compute/tasks/guest_delete_task.go b/pkg/compute/tasks/guest_delete_task.go
index 648a2e8af4..d32677445f 100644
--- a/pkg/compute/tasks/guest_delete_task.go
+++ b/pkg/compute/tasks/guest_delete_task.go
@@ -253,11 +253,12 @@ func (self *GuestDeleteTask) OnGuestDeleteComplete(ctx context.Context, obj db.I
 }
 
 func (self *GuestDeleteTask) DeleteGuest(ctx context.Context, guest *models.SGuest) {
+	isPendingDeleted := guest.PendingDeleted
 	guest.RealDelete(ctx, self.UserCred)
 	guest.RemoveAllMetadata(ctx, self.UserCred)
 	db.OpsLog.LogEvent(guest, db.ACT_DELOCATE, nil, self.UserCred)
 	logclient.AddActionLog(guest, logclient.ACT_DELETE, nil, self.UserCred, true)
-	if !guest.IsSystem && !guest.PendingDeleted {
+	if !guest.IsSystem && !isPendingDeleted {
 		self.NotifyServerDeleted(ctx, guest)
 	}
 	models.HostManager.ClearSchedDescCache(guest.HostId)
diff --git a/pkg/hostman/diskhandlers/doc.go b/pkg/hostman/diskhandlers/doc.go
new file mode 100644
index 0000000000..b0bbdf291d
--- /dev/null
+++ b/pkg/hostman/diskhandlers/doc.go
@@ -0,0 +1 @@
+package diskhandlers // import "yunion.io/x/onecloud/pkg/hostman/diskhandlers"
diff --git a/pkg/hostman/guesthandlers/doc.go b/pkg/hostman/guesthandlers/doc.go
new file mode 100644
index 0000000000..65e2037dd1
--- /dev/null
+++ b/pkg/hostman/guesthandlers/doc.go
@@ -0,0 +1 @@
+package guesthandlers // import "yunion.io/x/onecloud/pkg/hostman/guesthandlers"