diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js
index c7c3ff40..682262e7 100755
--- a/ui (gen4)/features/base.js	
+++ b/ui (gen4)/features/base.js	
@@ -662,7 +662,8 @@ core.ImageGridFeatures.Feature({
 				}
 
 				// images (full)...
-				if(changes === true || changes.images === true){
+				if(res.raw.images 
+						&& (changes === true || changes.images === true)){
 					res.index.images = res.raw.images
 
 				// images-diff...
diff --git a/ui (gen4)/features/collections.js b/ui (gen4)/features/collections.js
index 4230ab13..33f2f4d1 100755
--- a/ui (gen4)/features/collections.js	
+++ b/ui (gen4)/features/collections.js	
@@ -1110,6 +1110,7 @@ module.Collection = core.ImageGridFeatures.Feature({
 		// 		...use this as a base for collection serialization...
 		['prepareIndexForWrite', 
 			function(res, _, full){
+				var that = this
 				var changed = full == true 
 					|| res.changes === true
 					|| res.changes.collections
@@ -1144,13 +1145,16 @@ module.Collection = core.ImageGridFeatures.Feature({
 							Object.keys(raw)
 								.forEach(function(key){ metadata[key] = raw[key] })
 
-							// XXX use .prepareIndexForWrite(.., full) for this...
-							// XXX pass the date...
-							// collections/<gid>/data
-							if(metadata.data){
-								res.index[path +'/data'] = metadata.data
-								delete metadata.data
-							}
+							raw.date = res.date
+							// XXX set changes???
+							// XXX would be nice to have collections' .tags here... (???)
+							var prepared = that.prepareIndexForWrite(raw, full).index
+
+							Object.keys(prepared)
+								.forEach(function(key){
+									res.index[path +'/'+ key] = prepared[key]
+									delete metadata[key]
+								})
 						})
 				}
 			}],
diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js
index 5b2fcdf1..e94c0a9c 100755
--- a/ui (gen4)/features/filesystem.js	
+++ b/ui (gen4)/features/filesystem.js	
@@ -154,7 +154,7 @@ var IndexFormatActions = actions.Actions({
 				: null
 			changes = changes === null ? true : changes
 			return {
-				date: Date.timeStamp(),
+				date: json.date || Date.timeStamp(),
 				changes: changes,
 				raw: json,
 				index: {},