tweaked query result format