Fixup CgrId in FS-SM