synopsis: Only include question mark for nonempty query strings
prs: 1589