querystring: style fixes and additional tests