eager load should be more eager
Merge pull request #847 from code-dot-org/preload-models

eager load should be more eager