Modify the query format