Bringing back the previous version of your post because it may be relevant:
We are using copies of the default agents, with minor prompt tweaks to handle product names.
With that in mind, would your fix still take care of this, or will I need to update our agent’s prompt?