Handle special cases in EmergencyLight form
Fix updating test notes bug