making badge-counts reactive again, as performance is ok