diff --git a/server/storage_index.go b/server/storage_index.go
index faa3a819accd4869b982dc2091ba9a6345b6075c..5606a9467bc43458b37d53e102ebf7e003b3d4f2 100644
--- a/server/storage_index.go
+++ b/server/storage_index.go
@@ -299,6 +299,7 @@ LIMIT $2`
 		if err != nil {
 			return err
 		}
+		defer rows.Close()
 
 		var rowsRead bool
 		batch := bluge.NewBatch()
@@ -338,6 +339,7 @@ LIMIT $2`
 
 			doc, err := si.mapIndexStorageFields(dbUserID.String(), idx.Collection, dbKey, dbVersion, dbValue, idx.Fields, dbUpdateTime.Time)
 			if err != nil {
+				rows.Close()
 				si.logger.Error("Failed to map storage object values to index", zap.Error(err))
 				return err
 			}
@@ -417,7 +419,7 @@ func (si *LocalStorageIndex) mapIndexStorageFields(userID, collection, key, vers
 	rv.AddField(bluge.NewKeywordField("user_id", userID).StoreValue())
 	rv.AddField(bluge.NewKeywordField("version", version).StoreValue())
 
-	BlugeWalkDocument(mapValue, []string{}, rv)
+	BlugeWalkDocument(mapValue, []string{"value"}, rv)
 
 	return rv, nil
 }
diff --git a/server/storage_index_test.go b/server/storage_index_test.go
index 57c166b191905751adb84aed3411d14a9105b622..a27c4a0671876a4d46fde00a5e37e0d5456d8927 100644
--- a/server/storage_index_test.go
+++ b/server/storage_index_test.go
@@ -168,7 +168,7 @@ func TestLocalStorageIndex_Write(t *testing.T) {
 			t.Fatal(err.Error())
 		}
 
-		entries, err := storageIdx.List(ctx, indexName1, "+three:3", maxEntries1)
+		entries, err := storageIdx.List(ctx, indexName1, "+value.three:3", maxEntries1)
 		if err != nil {
 			t.Fatal(err.Error())
 		}
@@ -362,7 +362,7 @@ func TestLocalStorageIndex_List(t *testing.T) {
 			t.Fatal(err.Error())
 		}
 
-		entries, err := storageIdx.List(ctx, indexName, "one:1 three:3", 10)
+		entries, err := storageIdx.List(ctx, indexName, "value.one:1 value.three:3", 10)
 		if err != nil {
 			t.Fatal(err.Error())
 		}