Fix #936 w/o side effects: don't escape QUERY_STRING (not necessary for our purpose)