Changes to the QueryRobots code