switching in et-query from test3 branch for testing