Thanks for taking a look. Unfortunately, I don't think I have the proper SQL skills to safely change things in this case.

Anyone know if there's some workaround I haven't come across?

And would it be a good idea to submit this as a feature request?