Refactor comment counts on content pages
Refactor comment counts on content pages