diff --git a/ui (gen4)/features/sort.js b/ui (gen4)/features/sort.js
index 21307590..bb628881 100755
--- a/ui (gen4)/features/sort.js	
+++ b/ui (gen4)/features/sort.js	
@@ -469,13 +469,13 @@ module.Sort = core.ImageGridFeatures.Feature({
 			}],
 
 		['prepareIndexForWrite',
-			function(res){
+			function(res, _, full){
 				var c = this.changes
 
 				var save = function(attr){
-					if((c == null || c[attr]) && res.raw[attr]){
+					if((full || c == null || c[attr]) && res.raw[attr]){
 						// full save...
-						if(c == null){
+						if(full || c == null){
 							res.index[attr] = res.raw[attr] 
 
 						// build diff...
diff --git a/ui (gen4)/imagegrid/file.js b/ui (gen4)/imagegrid/file.js
index 2dc34e17..e376e14c 100755
--- a/ui (gen4)/imagegrid/file.js	
+++ b/ui (gen4)/imagegrid/file.js	
@@ -764,7 +764,6 @@ function(){
 // 		currently I'm for the second option...
 //
 // XXX move this to a better spot...
-// XXX make this merge if we locate more than one index...
 var buildIndex = 
 module.buildIndex = function(index, base_path){
 	var res = {}
@@ -796,6 +795,7 @@ module.buildIndex = function(index, base_path){
 	// buildup the data object...
 	// NOTE: this is mostly to attach stuff that is stored in separate files...
 	
+	// XXX move this to tags/marks/bookmarks...
 	// .tags + bookmarks + selection...
 	d.tags = index.tags || {} 
 	d.tags.bookmark = index.bookmarked ? index.bookmarked[0] : []