Only add querystring when URI is fixed