Cleanup multiple throughs for a query