Attempt to reduce number of queries by using eager_load

See issue 506 in roadmap repo.