Fix for bug where variables with 10-char name always get URL-encoded

Change-Id: Iadc727609d420c9e9ccfcb1c1d7abe27a79c4fa5