streamlined revision removes Linq queries and increments counts on the fly