Stabilize the generated query string (issue #547)