RID didn't really help here too. I suppose subscriber-id is the only option for us here and I should talk to ISP about using that instead.