Added check for non-empty content in header expire/etag headers