Thank you again.
I will try RAG approach also after cleaning the current data to see if it’s getting better.