Fixed dumb bug for not using the new query buffer