Could use some help with the "deselect" event and doing a "cancel" with trigs

I am having a problem. I have some universal units that are fully functional for all players, but when they deselect the unit, it returns to neutral passive. The problem is that the "deselect" event doesn't happen if the unit is in the middle of an upgrade. Does any know how I could get around this?

I thought maybe doing a cancel upgrade action if it is possible, but again I don't know if that will work since I don't even think the "deselect" event is being registered.

Another thing would be if I can make the upgrade happen instantly, so it would be near impossible to click away during, but I don't know how I would do this. I could do a unit - replace, if there was a way to detect what the upgrade was, but I haven't seen a way to detect that. I tried doing a unit -begins an upgrade -> set upgrade to 100%, but it still takes a while, it is not instant.

I think thats it, if more info is needed let me know.

To make an upgrade happen instantly, just change the build time of the unit on its stats 2 like 1 second or 0 or something around there.

Ummm, no...
1 second still takes long enough you can click away (thats y I tried 100% done), and 0 build time makes a unit never finish building.

You could try "Event: Unit is issued an order with no target" as the event to set upgrade to 100%.