+ [OE-3353] fix radio button ids to support maintaining selected values