Very clever application of GPT, thanks for sharing. For the more complex queries, I suspect Chain of Thought can help. Just ask the model to describe each step

Very clever application of GPT, thanks for sharing. For the more complex queries, I suspect Chain of Thought can help. Just ask the model to describe each step before writing the final query. Also, you can add self-consistency to step 5, which you are kind of already doing. Let it generate something like 20 corrected queries and then select the one that generates the most common result between all of them.