Fix plotting for surge and multilayer