FIX: n+1 queries in CategoryList