Adding a replaced unit back to selection

[Kam]

I am replacing a worker unit with a non-worker unit. I am unable to use Bear Form as even if I remove all buildings from the new units build queue the build icon is still there.

Once replaced is there a way to add the new unit back to selection and unit groups?

Alternatively is there a way to remove the build icon from the secondary unit when using Bear Form?

Edit: Solved.

 

[WereElf]

You can use
Selection - Add Last Replaced Unit to selection for Player Owner of Last Replaced Unit.