Q&A multiple date columns cause wrong date filter

I currently working on a Q&A visual, but my table schema has multiple date columns (i have set Synonyms for them as class start date and class end date). The visual purpose is to help the user export table with more detail on the subject. 

The first problem is some time when user query 3 or more columns then the date filter will be misinterpreted (from ... to ... -> or, after ... -> in ...)

the second problem is when user query 3 or more column and both date columns in same table then the filter get mix up (show A, B, C, class end date, class start date, where class start date from 2022 to 2024). the Preview show that the date column use in filter get mix up, from "class start date" to "class end date", the filter "from ... to ..." become " ... or ...  

-> if i query only one date column and filter that one then it show right answer

-> if i query only one date column and filter the other then it show right answer
-> if i query both date column and filter the "class start date" then it filter the "class end date" (which is wrong)
-> if i query both date column and filter the "class end date" then it filter the "class end date" (which is right)
This may be due to the "class end date" appear first before the "class start date" in the synonyms list.

Is there any promt or setting in Q&A that i can use to help the AI distinct these two columns when use to filter in query?