Remove n+1 queries from home and admin dashboard