perform fewer queries on some pages
Merge pull request #696 from alex/fewer-queries

perform fewer queries on some pages