Enhance how RSP handles error-fowarding and etag