alter queries to respond to new format