Yep, that is coming, we just need to restructure the way we cache counts.