Add :original in case the overridden element changes
Fix handling of host group with existing medium set