use includes to resolve N+1 query issue

发现2个N+1查询，顺手改了