Going back to allowing RG's to be non-quoted, but making sure the RG ID portion is only inserted once.