Tck query fixes