Bug 1104062 - only update counts once per resultset on changes

This diff is a little hard to read interwoven like this.  But it basically just takes out the part where it was looping over every ``resultset`` in the ``resultSetMap`` and ONLY operates on a single ``resultset`` at a time.