solve more n+1 problems
Merge pull request #64 from valerie-roske/query-optimization

#tech: solve more n+1 problems