Might be best just to have the Service Department to re-enter the upgrade key(s) before the item is returned? Surely they have some database they can look at the item to see what features were purchased?
How about the Service Department actually being a Service Department and entering the key (s) before the item is returned from repair? Not sure if this is really too much to ask from a "Service Department". Granted it is not a major issue, however, my 536HP did not need the DMR key re-entered, but my 436HP did and I was unaware that my 436HP needed the key re-entered until about 2 weeks after I received the radio back from repair.
Kind of like GOOD auto repair shops saving the vehicle and radio programming when the car is in the shop for a repair that might delete the programming and restoring the settings before they return the vehicle to the customer.
These key issue is new with the exception of the HP 1/2 Extreme Upgrade so maybe the Service Department should consider this as something that needs to be addressed.