Fix Commissions / Clawbacks query so that it doesn't go forever