More work on auto rid/cid negotiation