make string buildup more readable
update test to match query string