Fix broken topic recounting #2586 #1367

Fixing:
- unpublished topics
- moderation recount