Query format extending