use includes to resolve N+1 query issue
Merge pull request #19 from quake/feature/resolve_n_plus_1

use includes to resolve N+1 query issue