gras: added more theron counters + query work