Fix n+1 issues for serializers