Remove query stuff from RandomBlocks
Update QueryDemo for net net subsystem