Fix for one N+1 (agile aus only)
More N+1 fixes