Added bullet
Added includes to avoid n+1 query issues identified by bullet