Fix General info datasources for counter panels (cherry picked from commit 911bffd20826bf8898ccff02d3315720097a1da6)