Minor query formatting changes