better handling of pub/sub
fix data download problem when issueing multiple queries