Refine action "QueryTrigger" to adapt new table structure