rename query2 ns back into query