Fix CORS and etag issues