Fix data count discrepancy between map and table.
Merge pull request #124 from hbj/feature/count_discrepancy

Fix data count discrepancy between map and table.