Cannot Save BAQ with Errors

Anyone else solve the problem of saving a BAQ that has an error?
I have been working on some BAQs that may have 5-10 subqueries and at times I just want to save it.

One of the errors is that I have set sort fields on the Top Subquery, but have reassigned the Top to a subquery that I am trouble shooting.

Is there a switch that can be turn on to turn this off?

Have you already tried temporarily adding a simple Top Level query and then saving the BAQ?