Improved Q/tabs to work with Streams/access