diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile
index f280c5a0..26f9285d 100755
--- a/ui (gen4)/Makefile	
+++ b/ui (gen4)/Makefile	
@@ -632,6 +632,8 @@ $(BUILD_DIR)/package.nw: $$(PACK_MINIMAL)
 # XXX how do we resolve name collisions between this and electron builds???
 # 	a) naming convention: specific build directory suffixes...
 # 	b) generic components mixed and matched (node_modules, ImageGrid.Viewer, ...)
+# 		Q: will this actually save us any time/space, considering
+# 		   we'll need to copy the files anyway???
 # 	c) both...
 # XXX things to do next:
 # 	- copy rest of node_modules... (???)
diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js
index 583f87ff..12969881 100755
--- a/ui (gen4)/features/base.js	
+++ b/ui (gen4)/features/base.js	
@@ -1382,16 +1382,14 @@ module.TagsEdit = core.ImageGridFeatures.Feature({
 					res.index.tags = res.raw.data.tags
 				}
 
-				if((changes === true || changes.selected) 
-						&& res.raw.data.tags
-						&& res.raw.data.tags.selected){
-					res.index.marked = res.raw.data.tags.selected
+				// XXX should we save an empty list *iff* changes.selected is true???
+				if(changes === true || changes.selected){
+					res.index.marked = (res.raw.data.tags || {}).selected || []
 				}
-				if((changes === true || changes.bookmarked) 
-						&& res.raw.data.tags
-						&& res.raw.data.tags.bookmark){
+				// XXX should we save an empty list *iff* changes.bookmarked is true???
+				if(changes === true || changes.bookmarked){
 					res.index.bookmarked = [
-						res.raw.data.tags.bookmark || [],
+						(res.raw.data.tags || {}).bookmark || [],
 						{},
 					]
 				}