Don't escape query, to allow more params

Change-Id: Ie4100570e1ba0398de545e6787951d3d0d48d42f