Actually parse query parts of arguments
change rollup