Improve actions group logic (products, orders)