Updated TST to be query only