FIXUP - Adapt dashboard to new counter behavior.