[REF] 8.0 mgmtsystem claim

Fixed a few bugs about the stage_id yet someone should have a look to make sure everything is fine.