Fix the clause matching order
Fix the view of the action table to more simple