Need to encode = as well as & (fixes #2406)