Slight changes in query output format to permit format choosing in tree queries