fix form addition/removal to work with event demotion/promotion