Hopefully last big patch to QueryBot