switched to compact table of queries