Deal with query parameter unescaping