work on query subscription counting and bundling