Etag related bug fixed