More work on the new interface.  Count is now returned everytime the query bucket is updated