Fix for HTML-encoded values, like an apostrophe, in query string

Change-Id: I4a5e89ba6fd947ff738811d6f9cd494879cf128d