Maid 466 add headers

I suggest that you rename this to `next_remote_endpoint` to make its role more clear.