diff --git a/ui (gen4)/features/meta.js b/ui (gen4)/features/meta.js
index da405530..f4c7cdb1 100755
--- a/ui (gen4)/features/meta.js	
+++ b/ui (gen4)/features/meta.js	
@@ -105,6 +105,8 @@ core.ImageGridFeatures.Feature('imagegrid-testing', [
 	'imagegrid-commandline',
 	'imagegrid-ui',
 
+	//'-ui-partial-ribbons',
+
 
 	// read-only mode...
 	// XXX at this point this needs some more tuneup, the following 
diff --git a/ui (gen4)/features/ui-ribbons.js b/ui (gen4)/features/ui-ribbons.js
index ee785dab..476215db 100755
--- a/ui (gen4)/features/ui-ribbons.js	
+++ b/ui (gen4)/features/ui-ribbons.js	
@@ -610,9 +610,10 @@ actions.Actions({
 				? this.ribbons.elemGID(target)
 				// NOTE: data.getImage(..) can return null at start or end
 				// 		of ribbon, thus we need to account for this...
-				: (this.data.getImage(target)
+				: (this.data.getImage(target, 'before')
 					|| this.data.getImage(target, 'after'))
 
+
 			w = w || this.screenwidth
 
 			// get config data and normalize...
@@ -712,7 +713,7 @@ core.ImageGridFeatures.Feature({
 				// NOTE: we have to do this as we are called BEFORE the 
 				// 		actual focus change happens...
 				// XXX is there a better way to do this???
-				target = list != null ? target = this.data.getImage(target, list) : target
+				target = list != null ? this.data.getImage(target, list) : target
 
 				this.updateRibbon(target)
 			}],
diff --git a/ui (gen4)/imagegrid/data.js b/ui (gen4)/imagegrid/data.js
index b2758890..5d24afde 100755
--- a/ui (gen4)/imagegrid/data.js	
+++ b/ui (gen4)/imagegrid/data.js	
@@ -892,7 +892,12 @@ var DataPrototype = {
 			offset = -1
 		} else {
 			var offset = 0 
-			mode = mode == null ? 'before' : mode
+			// NOTE: this will set the default mode to 'before' but only
+			// 		when we are looking withing a specific set of images
+			// 		...otherwise it will be left as is, i.e. strict mode.
+			mode = (mode == null && list != null) ?
+				'before' 
+				: mode
 		}
 
 		// normalize the list to a sparse list of gids...
@@ -1105,7 +1110,7 @@ var DataPrototype = {
 				this.makeSparseImages(ribbons[k], res)
 			}
 			list = res.compact()
-			target = null 
+			target = null
 
 		// filter out the unloaded gids from given list...
 		} else if(target != null && target instanceof Array){