added query parameter escape/unescape where needed