apply some eager loading, and fix a defect where we made too large a query for admin users in some cases