Test new query format