The recent optimization to flatten attributes with shared visibility into a single CQ broke the original implementation of supporting subsets of attributes server-side (within an iterator) for queries. This functionality should be re-implemented.

This ticket depends on #563

See original ticket #143