Fix some n+1 queries on front page