fix N+1 query problem
tag 0.0.5