The current cells count (used for display), is not correctly calculated
for duplicate entries
Merge pull request #815 from garvankeeley/cell-count-fix

The current cells count (used for display), is not correctly calculated for duplicate entries