FIX: N+1 query for avatars

Title says it all :sweat: