Fix - ensure additional menu .shortcuts are upgraded correctly
Fix - correctly copy default shortcuts, without invalid elements