#tech: solve more n+1 problems