Only add request_id if present