Fixes for accordion/statistic/table/label