Fix some inconsistencies/errors in the data counters and fix a bug
where we wouldn't update a check if the only difference was the brokers
in use.