Get forward curves and vol surfaces working with new ExternalId/UniqueId handling