Fix Response return and add etag with any response