diff --git a/ui (gen4)/features/tags.js b/ui (gen4)/features/tags.js
index e40b425f..72c340cc 100755
--- a/ui (gen4)/features/tags.js	
+++ b/ui (gen4)/features/tags.js	
@@ -160,7 +160,7 @@ var TagUIActions = actions.Actions({
 				// split tag paths...
 				.map(function(e){ return e.split(/[\\\/]/g) })
 				.flat()) 
-			.concat(Object.keys((this.data || {}).tags || {}))
+			.concat(this.data ? this.data.tags.tags() : [])
    			.unique() },
 
 	// XXX add support for tag sets and paths...
@@ -265,7 +265,7 @@ var TagUIActions = actions.Actions({
 				that.tags
 					.sort()
 					// prep for sort...
-					.map(function(t, i){ return [t, i, (that.data.tags[t] || {}).len] })
+					.map(function(t, i){ return [t, i, (that.data.tags.values(t) || {}).len] })
 					// XXX add ability to sort by popularity, both local
 					//		(selected tags) and global...
 					.run(function(){
diff --git a/ui (gen4)/imagegrid/tags.js b/ui (gen4)/imagegrid/tags.js
index 3db2db25..38377fc2 100755
--- a/ui (gen4)/imagegrid/tags.js	
+++ b/ui (gen4)/imagegrid/tags.js	
@@ -153,7 +153,7 @@ var TagsClassPrototype = {
 			var res = []
 
 			while(code.length > 0){
-				c = code.shift()
+				var c = code.shift()
 				if(c == '[' || c == '('){
 					res.push( brace(code, c == '[' ? ']' : ')') )