Stable non-array query parameters

This solves the smaller problem of keeping non-array query parameters stable.

Related to #2