Further clean up QueryBot