Fix sidebar counts and fix include_archived
Fix conflicts after merging MH-587 to dev