fixes to QueryTool
Yah!  Eideticker!