Improved badge counts