thanks, yes this gets into the reason viewmodes are defined and the reason for the 'stripViewmode' function call. Since you're retrofitting over the viewmode, we might need to add this in, but then again we're pulling it out, so as long as it's broken ONLY behind the feature flag it might be ok.