N+1 errors on clients and payments