#17294 - avoid & being double encoded