Improvements to handle arbitrary ID's. Each filtered Id has its own data...

Improvements to handle arbitrary ID's. Each filtered Id has its own data queue, and all the others are handled by a common data queue.