Thanks for you answer!
I am doing the below mentioned part of your answer.
If having the simple version of the question in context helps, you can simply have the AI summarize what the question is asking before it produces the query in a special format that you can parse out. Then AI has both original question and rephrased question to shape its thinking even better.
However, I have tried fine-tuning(reading in the open-ai documentation and different articles) with 50 question and answers but my results did not improve.
Can you please point me to a good resource for fine-tuning if you know?
Thanks