I'll see what I can find out for you.

I've just pushed some fixes for this.

The shop changing is actually just bad luck, it's the same query it's always been.

Is this definitely fixed now?

Awesome! Thanks for confirming Locking as resolved. Please let Reya or I know if this needs to be unlocked.