Properly track table match counts.