Looking at this a bit further, it looks like it may be related to how I'm handle 'x' tags which is probably fair. Doing a bit of testing on my end and hoping that actually fixes it :-)