diff --git a/kernel/conf/editor.go b/kernel/conf/editor.go
index a24e7c680..d94d72915 100644
--- a/kernel/conf/editor.go
+++ b/kernel/conf/editor.go
@@ -86,7 +86,7 @@ func NewEditor() *Editor {
 		Justify:                         false,
 		RTL:                             false,
 		BacklinkExpandCount:             8,
-		BackmentionExpandCount:          8,
+		BackmentionExpandCount:          -1,
 		Markdown:                        util.MarkdownSettings,
 	}
 }
diff --git a/kernel/model/index.go b/kernel/model/index.go
index 6ac83c750..d82c9e3b7 100644
--- a/kernel/model/index.go
+++ b/kernel/model/index.go
@@ -115,10 +115,15 @@ func unindex(boxID string) {
 }
 
 func (box *Box) Index() {
+	task.AppendTask(task.DatabaseIndexRef, removeBoxRefs, box.ID)
 	task.AppendTask(task.DatabaseIndex, index, box.ID)
 	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
 }
 
+func removeBoxRefs(boxID string) {
+	sql.DeleteBoxRefsQueue(boxID)
+}
+
 func index(boxID string) {
 	box := Conf.Box(boxID)
 	if nil == box {
@@ -219,8 +224,6 @@ func IndexRefs() {
 	luteEngine := util.NewLute()
 	boxes := Conf.GetOpenedBoxes()
 	for _, box := range boxes {
-		sql.DeleteBoxRefsQueue(box.ID)
-
 		pages := pagedPaths(filepath.Join(util.DataDir, box.ID), 32)
 		for _, paths := range pages {
 			for _, treeAbsPath := range paths {