Fixing random out-of-date test errors

Explanations inline.
Don't URL-escape field separators

Everything else is already escaped when the individual entity is
being added to the query string. Escaping it again would escape
the ',' separator and break a test. This fixes that.