Thanks for posting to the Community.
Have you made any progress or can you provide an update on this issue? You might assist someone with a similar question.
I haven't made any progress or gotten any updates on this, it is still a problem.
I updated the queries in console and then had to delete all reference to the query in the dashboard and menu and then re-add it back.