Replace ?etag=hash with ?hash, remove etag/hash where not necessary